diff options
Diffstat (limited to 'konqueror/sidebar/trees')
17 files changed, 170 insertions, 171 deletions
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp index 208fe2ee6..5e9b29236 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp @@ -45,39 +45,39 @@ KonqSidebarBookmarkModule::KonqSidebarBookmarkModule( KonqSidebarTree * parentTr formats << "text/uri-list" << "application/x-xbel" << "text/plain"; tree()->setDropFormats(formats); - connect(tree(), TQT_SIGNAL(moved(TQListViewItem*,TQListViewItem*,TQListViewItem*)), - this, TQT_SLOT(slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*))); - connect(tree(), TQT_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)), - this, TQT_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*))); + connect(tree(), TQ_SIGNAL(moved(TQListViewItem*,TQListViewItem*,TQListViewItem*)), + this, TQ_SLOT(slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*))); + connect(tree(), TQ_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)), + this, TQ_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*))); - connect(tree(), TQT_SIGNAL(expanded(TQListViewItem*)), - this, TQT_SLOT(slotOpenChange(TQListViewItem*))); - connect(tree(), TQT_SIGNAL(collapsed(TQListViewItem*)), - this, TQT_SLOT(slotOpenChange(TQListViewItem*))); + connect(tree(), TQ_SIGNAL(expanded(TQListViewItem*)), + this, TQ_SLOT(slotOpenChange(TQListViewItem*))); + connect(tree(), TQ_SIGNAL(collapsed(TQListViewItem*)), + this, TQ_SLOT(slotOpenChange(TQListViewItem*))); m_collection = new TDEActionCollection( this, "bookmark actions" ); (void) new TDEAction( i18n("&Create New Folder"), "folder-new", 0, this, - TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder"); + TQ_SLOT( slotCreateFolder() ), m_collection, "create_folder"); (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, this, - TQT_SLOT( slotDelete() ), m_collection, "delete_folder"); + TQ_SLOT( slotDelete() ), m_collection, "delete_folder"); (void) new TDEAction( i18n("Delete Bookmark"), "edit-delete", 0, this, - TQT_SLOT( slotDelete() ), m_collection, "delete_bookmark"); + TQ_SLOT( slotDelete() ), m_collection, "delete_bookmark"); (void) new TDEAction( i18n("Properties"), "edit", 0, this, - TQT_SLOT( slotProperties() ), m_collection, "item_properties"); + TQ_SLOT( slotProperties() ), m_collection, "item_properties"); (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, this, - TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); + TQ_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, this, - TQT_SLOT( slotOpenTab() ), m_collection, "open_tab"); + TQ_SLOT( slotOpenTab() ), m_collection, "open_tab"); (void) new TDEAction( i18n("Open Folder in Tabs"), "tab_new", 0, this, - TQT_SLOT( slotOpenTab() ), m_collection, "folder_open_tabs"); + TQ_SLOT( slotOpenTab() ), m_collection, "folder_open_tabs"); (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, this, - TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location"); + TQ_SLOT( slotCopyLocation() ), m_collection, "copy_location"); - KStdAction::editBookmarks( KonqBookmarkManager::self(), TQT_SLOT( slotEditBookmarks() ), + KStdAction::editBookmarks( KonqBookmarkManager::self(), TQ_SLOT( slotEditBookmarks() ), m_collection, "edit_bookmarks" ); - connect( KonqBookmarkManager::self(), TQT_SIGNAL(changed(const TQString &, const TQString &) ), - TQT_SLOT( slotBookmarksChanged(const TQString &) ) ); + connect( KonqBookmarkManager::self(), TQ_SIGNAL(changed(const TQString &, const TQString &) ), + TQ_SLOT( slotBookmarksChanged(const TQString &) ) ); } KonqSidebarBookmarkModule::~KonqSidebarBookmarkModule() @@ -387,7 +387,7 @@ void KonqSidebarBookmarkModule::slotOpenTab() else return; - DCOPRef ref(kapp->dcopClient()->appId(), tree()->topLevelWidget()->name()); + DCOPRef ref(tdeApp->dcopClient()->appId(), tree()->topLevelWidget()->name()); if (bookmark.isGroup()) { KBookmarkGroup group = bookmark.toGroup(); @@ -412,9 +412,9 @@ void KonqSidebarBookmarkModule::slotCopyLocation() if ( !bookmark.isGroup() ) { - kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), + tdeApp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), TQClipboard::Selection ); - kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), + tdeApp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), TQClipboard::Clipboard ); } } @@ -574,7 +574,7 @@ TQString BookmarkEditDialog::finalTitle() const extern "C" { - KDE_EXPORT KonqSidebarTreeModule* create_konq_sidebartree_bookmarks(KonqSidebarTree* par,const bool) + TDE_EXPORT KonqSidebarTreeModule* create_konq_sidebartree_bookmarks(KonqSidebarTree* par,const bool) { return new KonqSidebarBookmarkModule(par); } diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.h b/konqueror/sidebar/trees/bookmark_module/bookmark_module.h index ba78a2b96..b39a48601 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.h +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.h @@ -34,7 +34,7 @@ class KLineEdit; */ class KonqSidebarBookmarkModule : public TQObject, public KonqSidebarTreeModule { - Q_OBJECT + TQ_OBJECT public: KonqSidebarBookmarkModule( KonqSidebarTree * parentTree ); virtual ~KonqSidebarBookmarkModule(); @@ -77,7 +77,7 @@ private: class BookmarkEditDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: BookmarkEditDialog( const TQString& title, const TQString& url, diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp index 8368d4d37..56f77ba40 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp @@ -113,7 +113,7 @@ void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup if (m_fileItem->isLink()) { TQFont f( _painter->font() ); - f.setItalic( TRUE ); + f.setItalic( true ); _painter->setFont( f ); } TQListViewItem::paintCell( _painter, _cg, _column, _width, _alignment ); diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp index b1b6d0563..487bbf4dd 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp @@ -22,7 +22,7 @@ #include "dirtree_item.h" #include <kdebug.h> #include <kprotocolinfo.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdemessagebox.h> #include <kiconloader.h> #include <kdirlister.h> @@ -52,8 +52,8 @@ KonqSidebarDirTreeModule::~KonqSidebarDirTreeModule() // KDirLister may still emit canceled while being deleted. if (m_dirLister) { - disconnect( m_dirLister, TQT_SIGNAL( canceled( const KURL & ) ), - this, TQT_SLOT( slotListingStopped( const KURL & ) ) ); + disconnect( m_dirLister, TQ_SIGNAL( canceled( const KURL & ) ), + this, TQ_SLOT( slotListingStopped( const KURL & ) ) ); delete m_dirLister; } } @@ -76,7 +76,7 @@ void KonqSidebarDirTreeModule::addTopLevelItem( KonqSidebarTreeTopLevelItem * it if(m_topLevelItem) // We can handle only one at a time ! kdError() << "KonqSidebarDirTreeModule::addTopLevelItem: Impossible, we can have only one toplevel item !" << endl; - KDesktopFile cfg( item->path(), true ); + TDEDesktopFile cfg( item->path(), true ); cfg.setDollarExpansion(true); KURL targetURL; @@ -303,18 +303,18 @@ void KonqSidebarDirTreeModule::openSubFolder( KonqSidebarTreeItem *item ) // mimetypes<<TQString("inode/directory"); // m_dirLister->setMimeFilter(mimetypes); - connect( m_dirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ), - this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) ); - connect( m_dirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ), - this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) ); - connect( m_dirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ), - this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) ); - connect( m_dirLister, TQT_SIGNAL( completed( const KURL & ) ), - this, TQT_SLOT( slotListingStopped( const KURL & ) ) ); - connect( m_dirLister, TQT_SIGNAL( canceled( const KURL & ) ), - this, TQT_SLOT( slotListingStopped( const KURL & ) ) ); - connect( m_dirLister, TQT_SIGNAL( redirection( const KURL &, const KURL & ) ), - this, TQT_SLOT( slotRedirection( const KURL &, const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( newItems( const KFileItemList & ) ), + this, TQ_SLOT( slotNewItems( const KFileItemList & ) ) ); + connect( m_dirLister, TQ_SIGNAL( refreshItems( const KFileItemList & ) ), + this, TQ_SLOT( slotRefreshItems( const KFileItemList & ) ) ); + connect( m_dirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ), + this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) ); + connect( m_dirLister, TQ_SIGNAL( completed( const KURL & ) ), + this, TQ_SLOT( slotListingStopped( const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( canceled( const KURL & ) ), + this, TQ_SLOT( slotListingStopped( const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( redirection( const KURL &, const KURL & ) ), + this, TQ_SLOT( slotRedirection( const KURL &, const KURL & ) ) ); } @@ -624,7 +624,7 @@ void KonqSidebarDirTreeModule::followURL( const KURL & url ) extern "C" { - KDE_EXPORT KonqSidebarTreeModule *create_konq_sidebartree_dirtree(KonqSidebarTree* par,const bool showHidden) + TDE_EXPORT KonqSidebarTreeModule *create_konq_sidebartree_dirtree(KonqSidebarTree* par,const bool showHidden) { return new KonqSidebarDirTreeModule(par,showHidden); } diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.h b/konqueror/sidebar/trees/dirtree_module/dirtree_module.h index 89b5dcbaf..ccc607a79 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.h +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.h @@ -33,7 +33,7 @@ class KonqPropsView; class KonqSidebarDirTreeModule : public TQObject, public KonqSidebarTreeModule { - Q_OBJECT + TQ_OBJECT public: KonqSidebarDirTreeModule( KonqSidebarTree * parentTree, bool ); virtual ~KonqSidebarDirTreeModule(); diff --git a/konqueror/sidebar/trees/history_module/history_item.cpp b/konqueror/sidebar/trees/history_module/history_item.cpp index 44389702e..4825cfeda 100644 --- a/konqueror/sidebar/trees/history_module/history_item.cpp +++ b/konqueror/sidebar/trees/history_module/history_item.cpp @@ -132,18 +132,18 @@ void KonqSidebarHistoryItem::paintCell( TQPainter *p, const TQColorGroup & cg, TQDateTime current = TQDateTime::currentDateTime(); if ( s_settings->m_metricYoungerThan == KonqSidebarHistorySettings::DAYS ) - dt = TQT_TQDATETIME_OBJECT(current.addDays( - s_settings->m_valueYoungerThan )); + dt = current.addDays( - s_settings->m_valueYoungerThan ); else - dt = TQT_TQDATETIME_OBJECT(current.addSecs( - (s_settings->m_valueYoungerThan * 60) )); + dt = current.addSecs( - (s_settings->m_valueYoungerThan * 60) ); if ( m_entry->lastVisited > dt ) p->setFont( s_settings->m_fontYoungerThan ); else { if ( s_settings->m_metricOlderThan == KonqSidebarHistorySettings::DAYS ) - dt = TQT_TQDATETIME_OBJECT(current.addDays( - s_settings->m_valueOlderThan )); + dt = current.addDays( - s_settings->m_valueOlderThan ); else - dt = TQT_TQDATETIME_OBJECT(current.addSecs( - (s_settings->m_valueOlderThan * 60) )); + dt = current.addSecs( - (s_settings->m_valueOlderThan * 60) ); if ( m_entry->lastVisited < dt ) p->setFont( s_settings->m_fontOlderThan ); diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp index 6f051a553..f941bd0f7 100644 --- a/konqueror/sidebar/trees/history_module/history_module.cpp +++ b/konqueror/sidebar/trees/history_module/history_module.cpp @@ -51,7 +51,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree s_settings->readSettings( true ); } - connect( s_settings, TQT_SIGNAL( settingsChanged() ), TQT_SLOT( slotSettingsChanged() )); + connect( s_settings, TQ_SIGNAL( settingsChanged() ), TQ_SLOT( slotSettingsChanged() )); m_dict.setAutoDelete( true ); m_currentTime = TQDateTime::currentDateTime(); @@ -63,35 +63,35 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree KonqHistoryManager *manager = KonqHistoryManager::kself(); - connect( manager, TQT_SIGNAL( loadingFinished() ), TQT_SLOT( slotCreateItems() )); - connect( manager, TQT_SIGNAL( cleared() ), TQT_SLOT( clear() )); + connect( manager, TQ_SIGNAL( loadingFinished() ), TQ_SLOT( slotCreateItems() )); + connect( manager, TQ_SIGNAL( cleared() ), TQ_SLOT( clear() )); - connect( manager, TQT_SIGNAL( entryAdded( const KonqHistoryEntry * ) ), - TQT_SLOT( slotEntryAdded( const KonqHistoryEntry * ) )); - connect( manager, TQT_SIGNAL( entryRemoved( const KonqHistoryEntry *) ), - TQT_SLOT( slotEntryRemoved( const KonqHistoryEntry *) )); + connect( manager, TQ_SIGNAL( entryAdded( const KonqHistoryEntry * ) ), + TQ_SLOT( slotEntryAdded( const KonqHistoryEntry * ) )); + connect( manager, TQ_SIGNAL( entryRemoved( const KonqHistoryEntry *) ), + TQ_SLOT( slotEntryRemoved( const KonqHistoryEntry *) )); - connect( parentTree, TQT_SIGNAL( expanded( TQListViewItem * )), - TQT_SLOT( slotItemExpanded( TQListViewItem * ))); + connect( parentTree, TQ_SIGNAL( expanded( TQListViewItem * )), + TQ_SLOT( slotItemExpanded( TQListViewItem * ))); m_collection = new TDEActionCollection( this, "history actions" ); (void) new TDEAction( i18n("New &Window"), "window-new", 0, this, - TQT_SLOT( slotNewWindow() ), m_collection, "open_new"); + TQ_SLOT( slotNewWindow() ), m_collection, "open_new"); (void) new TDEAction( i18n("&Remove Entry"), "edit-delete", 0, this, - TQT_SLOT( slotRemoveEntry() ), m_collection, "remove"); + TQ_SLOT( slotRemoveEntry() ), m_collection, "remove"); (void) new TDEAction( i18n("C&lear History"), "history_clear", 0, this, - TQT_SLOT( slotClearHistory() ), m_collection, "clear"); + TQ_SLOT( slotClearHistory() ), m_collection, "clear"); (void) new TDEAction( i18n("&Preferences..."), "configure", 0, this, - TQT_SLOT( slotPreferences()), m_collection, "preferences"); + TQ_SLOT( slotPreferences()), m_collection, "preferences"); TDERadioAction *sort; sort = new TDERadioAction( i18n("By &Name"), 0, this, - TQT_SLOT( slotSortByName() ), m_collection, "byName"); + TQ_SLOT( slotSortByName() ), m_collection, "byName"); sort->setExclusiveGroup("SortGroup"); sort->setChecked( m_sortsByName ); sort = new TDERadioAction( i18n("By &Date"), 0, this, - TQT_SLOT( slotSortByDate() ), m_collection, "byDate"); + TQ_SLOT( slotSortByDate() ), m_collection, "byDate"); sort->setExclusiveGroup("SortGroup"); sort->setChecked( !m_sortsByName ); @@ -358,7 +358,7 @@ void KonqSidebarHistoryModule::slotClearHistory() extern "C" { - KDE_EXPORT KonqSidebarTreeModule* create_konq_sidebartree_history(KonqSidebarTree* par, const bool) + TDE_EXPORT KonqSidebarTreeModule* create_konq_sidebartree_history(KonqSidebarTree* par, const bool) { return new KonqSidebarHistoryModule(par); } diff --git a/konqueror/sidebar/trees/history_module/history_module.h b/konqueror/sidebar/trees/history_module/history_module.h index 933097455..649f68150 100644 --- a/konqueror/sidebar/trees/history_module/history_module.h +++ b/konqueror/sidebar/trees/history_module/history_module.h @@ -38,7 +38,7 @@ class KonqSidebarTreeItem; class KonqSidebarHistoryModule : public TQObject, public KonqSidebarTreeModule { - Q_OBJECT + TQ_OBJECT public: enum { diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp index eb1621ae9..951dce28b 100644 --- a/konqueror/sidebar/trees/history_module/history_settings.cpp +++ b/konqueror/sidebar/trees/history_module/history_settings.cpp @@ -98,7 +98,7 @@ void KonqSidebarHistorySettings::applySettings() delete config; // notify konqueror instances about the new configuration - kapp->dcopClient()->send( "konqueror*", "KonqSidebarHistorySettings", + tdeApp->dcopClient()->send( "konqueror*", "KonqSidebarHistorySettings", "notifySettingsChanged()", TQByteArray() ); } diff --git a/konqueror/sidebar/trees/history_module/history_settings.h b/konqueror/sidebar/trees/history_module/history_settings.h index 7b7d75006..f4bdebe70 100644 --- a/konqueror/sidebar/trees/history_module/history_settings.h +++ b/konqueror/sidebar/trees/history_module/history_settings.h @@ -28,7 +28,7 @@ class KonqSidebarHistorySettings : public TQObject, public DCOPObject { K_DCOP - Q_OBJECT + TQ_OBJECT public: enum { MINUTES, DAYS }; diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp index 70e42e113..056d0deb7 100644 --- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp +++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp @@ -75,33 +75,33 @@ HistorySidebarConfig::HistorySidebarConfig( TQWidget *parent, const char* name, dialog->comboOlder->insertItem( i18n("Days"), KonqSidebarHistorySettings::DAYS ); - connect( dialog->cbExpire, TQT_SIGNAL( toggled( bool )), - dialog->spinExpire, TQT_SLOT( setEnabled( bool ))); - connect( dialog->spinExpire, TQT_SIGNAL( valueChanged( int )), - this, TQT_SLOT( slotExpireChanged( int ))); - - connect( dialog->spinNewer, TQT_SIGNAL( valueChanged( int )), - TQT_SLOT( slotNewerChanged( int ))); - connect( dialog->spinOlder, TQT_SIGNAL( valueChanged( int )), - TQT_SLOT( slotOlderChanged( int ))); - - connect( dialog->btnFontNewer, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotGetFontNewer() )); - connect( dialog->btnFontOlder, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotGetFontOlder() )); - connect( dialog->btnClearHistory, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotClearHistory() )); - - connect( dialog->cbDetailedTips, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( configChanged() )); - connect( dialog->cbExpire, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( configChanged() )); - connect( dialog->spinEntries, TQT_SIGNAL( valueChanged( int )), - TQT_SLOT( configChanged() )); - connect( dialog->comboNewer, TQT_SIGNAL( activated( int )), - TQT_SLOT( configChanged() )); - connect( dialog->comboOlder, TQT_SIGNAL( activated( int )), - TQT_SLOT( configChanged() )); + connect( dialog->cbExpire, TQ_SIGNAL( toggled( bool )), + dialog->spinExpire, TQ_SLOT( setEnabled( bool ))); + connect( dialog->spinExpire, TQ_SIGNAL( valueChanged( int )), + this, TQ_SLOT( slotExpireChanged( int ))); + + connect( dialog->spinNewer, TQ_SIGNAL( valueChanged( int )), + TQ_SLOT( slotNewerChanged( int ))); + connect( dialog->spinOlder, TQ_SIGNAL( valueChanged( int )), + TQ_SLOT( slotOlderChanged( int ))); + + connect( dialog->btnFontNewer, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotGetFontNewer() )); + connect( dialog->btnFontOlder, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotGetFontOlder() )); + connect( dialog->btnClearHistory, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotClearHistory() )); + + connect( dialog->cbDetailedTips, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( configChanged() )); + connect( dialog->cbExpire, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( configChanged() )); + connect( dialog->spinEntries, TQ_SIGNAL( valueChanged( int )), + TQ_SLOT( configChanged() )); + connect( dialog->comboNewer, TQ_SIGNAL( activated( int )), + TQ_SLOT( configChanged() )); + connect( dialog->comboOlder, TQ_SIGNAL( activated( int )), + TQ_SLOT( configChanged() )); dialog->show(); topLayout->add(dialog); @@ -155,13 +155,13 @@ void HistorySidebarConfig::save() TQByteArray dataAge; TQDataStream streamAge( dataAge, IO_WriteOnly ); streamAge << age << "foo"; - kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager", + tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager", "notifyMaxAge(TQ_UINT32, TQCString)", dataAge ); TQByteArray dataCount; TQDataStream streamCount( dataCount, IO_WriteOnly ); streamCount << count << "foo"; - kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager", + tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager", "notifyMaxCount(TQ_UINT32, TQCString)", dataCount ); m_settings->m_valueYoungerThan = dialog->spinNewer->value(); diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.h b/konqueror/sidebar/trees/history_module/kcmhistory.h index ac82cdd60..215b78027 100644 --- a/konqueror/sidebar/trees/history_module/kcmhistory.h +++ b/konqueror/sidebar/trees/history_module/kcmhistory.h @@ -29,7 +29,7 @@ class KonqSidebarHistoryDlg; class HistorySidebarConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: HistorySidebarConfig( TQWidget *parent=0, const char* name=0, const TQStringList &list=TQStringList() ); diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index 514c28095..9132d531b 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.cpp +++ b/konqueror/sidebar/trees/konq_sidebartree.cpp @@ -33,17 +33,17 @@ #include <tdeaction.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kdirnotify_stub.h> #include <tdeglobalsettings.h> #include <kiconloader.h> #include <kinputdialog.h> #include <tdeio/netaccess.h> #include <kmimetype.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kpropertiesdialog.h> #include <kprotocolinfo.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurldrag.h> #include <stdlib.h> @@ -93,7 +93,7 @@ void KonqSidebarTree::loadModuleFactories() for (TQStringList::ConstIterator it=list.begin();it!=list.end();++it) { - KSimpleConfig ksc(*it); + TDESimpleConfig ksc(*it); ksc.setGroup("Desktop Entry"); TQString name = ksc.readEntry("X-TDE-TreeModule"); TQString libName = ksc.readEntry("X-TDE-TreeModule-Lib"); @@ -136,8 +136,8 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidg m_part = parent; m_animationTimer = new TQTimer( this ); - connect( m_animationTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAnimation() ) ); + connect( m_animationTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAnimation() ) ); m_currentBeforeDropItem = 0; m_dropItem = 0; @@ -148,22 +148,22 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidg setTreeStepSize(15); m_autoOpenTimer = new TQTimer( this ); - connect( m_autoOpenTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoOpenFolder() ) ); - - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT( slotMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)) ); - connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ), - this, TQT_SLOT( slotSidebarMouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - this, TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); - - connect( this, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)), - this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int))); + connect( m_autoOpenTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoOpenFolder() ) ); + + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT( slotMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)) ); + connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ), + this, TQ_SLOT( slotSidebarMouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + this, TQ_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); + + connect( this, TQ_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)), + this, TQ_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int))); /* assert( m_part->getInterfaces()->getInstance()->dirs ); TQString dirtreeDir = m_part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" ); */ @@ -390,7 +390,7 @@ void KonqSidebarTree::addURL(KonqSidebarTreeTopLevelItem* item, const KURL & url TQString filename = findUniqueFilename(path, name); destUrl.setPath(filename); - KDesktopFile cfg(filename); + TDEDesktopFile cfg(filename); cfg.writeEntry("Encoding", "UTF-8"); cfg.writeEntry("Type","Link"); cfg.writeEntry("URL", url.url()); @@ -483,7 +483,7 @@ void KonqSidebarTree::slotExecuted( TQListViewItem *item ) void KonqSidebarTree::slotMouseButtonPressed( int _button, TQListViewItem* _item, const TQPoint&, int col ) { KonqSidebarTreeItem * item = static_cast<KonqSidebarTreeItem*>( _item ); - if (_button == Qt::RightButton) + if (_button == TQt::RightButton) { if ( item && col < 2) { @@ -502,10 +502,10 @@ void KonqSidebarTree::slotSidebarMouseButtonClicked(int _button, TQListViewItem* if(_item && col < 2) { switch( _button ) { - case Qt::LeftButton: + case TQt::LeftButton: slotExecuted( item ); break; - case Qt::MidButton: + case TQt::MidButton: item->middleButtonClicked(); break; } @@ -558,7 +558,7 @@ void KonqSidebarTree::FilesAdded( const KURL & dir ) kdDebug(1201) << "KonqSidebarTree::FilesAdded " << dir.url() << endl; if ( m_dirtreeDir.dir.isParentOf( dir ) ) // We use a timer in case of DCOP re-entrance.. - TQTimer::singleShot( 0, this, TQT_SLOT( rescanConfiguration() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( rescanConfiguration() ) ); } void KonqSidebarTree::FilesRemoved( const KURL::List & urls ) @@ -569,7 +569,7 @@ void KonqSidebarTree::FilesRemoved( const KURL::List & urls ) //kdDebug(1201) << "KonqSidebarTree::FilesRemoved " << (*it).prettyURL() << endl; if ( m_dirtreeDir.dir.isParentOf( *it ) ) { - TQTimer::singleShot( 0, this, TQT_SLOT( rescanConfiguration() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( rescanConfiguration() ) ); kdDebug(1201) << "KonqSidebarTree::FilesRemoved done" << endl; return; } @@ -610,7 +610,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path // Version 7 includes update of network places const int currentVersion = 7; TQString key = TQString::fromLatin1("X-TDE-DirTreeVersionNumber"); - KSimpleConfig versionCfg( path + "/.directory" ); + TDESimpleConfig versionCfg( path + "/.directory" ); int versionNumber = versionCfg.readNumEntry( key, 0 ); kdDebug(1201) << "KonqSidebarTree::scanDir found version " << versionNumber << endl; if ( versionNumber < currentVersion ) @@ -720,7 +720,7 @@ void KonqSidebarTree::loadTopLevelGroup( KonqSidebarTreeItem *parent, const TQSt if ( TQFile::exists( dotDirectoryFile ) ) { kdDebug(1201) << "Reading the .directory" << endl; - KSimpleConfig cfg( dotDirectoryFile, true ); + TDESimpleConfig cfg( dotDirectoryFile, true ); cfg.setDesktopGroup(); name = cfg.readEntry( "Name", name ); icon = cfg.readEntry( "Icon", icon ); @@ -755,7 +755,7 @@ void KonqSidebarTree::loadTopLevelGroup( KonqSidebarTreeItem *parent, const TQSt void KonqSidebarTree::loadTopLevelItem( KonqSidebarTreeItem *parent, const TQString &filename ) { - KDesktopFile cfg( filename, true ); + TDEDesktopFile cfg( filename, true ); cfg.setDollarExpansion(true); TQFileInfo inf( filename ); @@ -883,7 +883,7 @@ void KonqSidebarTree::enableActions( bool copy, bool cut, bool paste, bool KonqSidebarTree::tabSupport() { // see if the newTab() dcop function is available (i.e. the sidebar is embedded into konqueror) - DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name()); + DCOPRef ref(tdeApp->dcopClient()->appId(), topLevelWidget()->name()); DCOPReply reply = ref.call("functions()"); if (reply.isValid()) { QCStringList funcs; @@ -908,22 +908,22 @@ void KonqSidebarTree::showToplevelContextMenu() if (!m_collection) { m_collection = new TDEActionCollection( this, "bookmark actions" ); - (void) new TDEAction( i18n("&Create New Folder..."), "folder-new", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder"); - (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotDelete() ), m_collection, "delete_folder"); - (void) new TDEAction( i18n("Rename"), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotRename() ), m_collection, "rename"); - (void) new TDEAction( i18n("Delete Link"), "edit-delete", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotDelete() ), m_collection, "delete_link"); - (void) new TDEAction( i18n("Properties"), "edit", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotProperties() ), m_collection, "item_properties"); - (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); - (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotOpenTab() ), m_collection, "open_tab"); - (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location"); + (void) new TDEAction( i18n("&Create New Folder..."), "folder-new", 0, this, + TQ_SLOT( slotCreateFolder() ), m_collection, "create_folder"); + (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, this, + TQ_SLOT( slotDelete() ), m_collection, "delete_folder"); + (void) new TDEAction( i18n("Rename"), 0, this, + TQ_SLOT( slotRename() ), m_collection, "rename"); + (void) new TDEAction( i18n("Delete Link"), "edit-delete", 0, this, + TQ_SLOT( slotDelete() ), m_collection, "delete_link"); + (void) new TDEAction( i18n("Properties"), "edit", 0, this, + TQ_SLOT( slotProperties() ), m_collection, "item_properties"); + (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, this, + TQ_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); + (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, this, + TQ_SLOT( slotOpenTab() ), m_collection, "open_tab"); + (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, this, + TQ_SLOT( slotCopyLocation() ), m_collection, "copy_location"); } TQPopupMenu *menu = new TQPopupMenu; @@ -1012,7 +1012,6 @@ void KonqSidebarTree::slotProperties() KPropertiesDialog *dlg = new KPropertiesDialog( url ); dlg->setFileNameReadOnly(true); dlg->exec(); - delete dlg; } void KonqSidebarTree::slotOpenNewWindow() @@ -1024,7 +1023,7 @@ void KonqSidebarTree::slotOpenNewWindow() void KonqSidebarTree::slotOpenTab() { if (!m_currentTopLevelItem) return; - DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name()); + DCOPRef ref(tdeApp->dcopClient()->appId(), topLevelWidget()->name()); ref.call( "newTab(TQString)", m_currentTopLevelItem->externalURL().url() ); } @@ -1032,8 +1031,8 @@ void KonqSidebarTree::slotCopyLocation() { if (!m_currentTopLevelItem) return; KURL url = m_currentTopLevelItem->externalURL(); - kapp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Selection ); - kapp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Clipboard ); + tdeApp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Selection ); + tdeApp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Clipboard ); } /////////////////////////////////////////////////////////////////// diff --git a/konqueror/sidebar/trees/konq_sidebartree.h b/konqueror/sidebar/trees/konq_sidebartree.h index 703a256c9..f76027481 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.h +++ b/konqueror/sidebar/trees/konq_sidebartree.h @@ -75,7 +75,7 @@ typedef enum { */ class KonqSidebarTree : public TDEListView, public KDirNotify { - Q_OBJECT + TQ_OBJECT public: KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path ); virtual ~KonqSidebarTree(); diff --git a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp index 0ba22363f..bafcb973e 100644 --- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp +++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp @@ -35,7 +35,7 @@ void KonqSidebarTreeTopLevelItem::init() TQString desktopFile = m_path; if ( isTopLevelGroup() ) desktopFile += "/.directory"; - KSimpleConfig cfg( desktopFile, true ); + TDESimpleConfig cfg( desktopFile, true ); cfg.setDesktopGroup(); m_comment = cfg.readEntry( "Comment" ); } @@ -189,7 +189,7 @@ void KonqSidebarTreeTopLevelItem::rename( const TQString & name ) TQString desktopFile = m_path; if ( isTopLevelGroup() ) desktopFile += "/.directory"; - KSimpleConfig cfg( desktopFile ); + TDESimpleConfig cfg( desktopFile ); cfg.setDesktopGroup(); cfg.writeEntry( "Name", name ); cfg.sync(); diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp index 1903c2328..9baa24d1d 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.cpp +++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp @@ -2,8 +2,8 @@ #include "konqsidebar_tree.moc" #include "konq_sidebartree.h" #include <kdebug.h> -#include <kstandarddirs.h> -#include <ksimpleconfig.h> +#include <tdestandarddirs.h> +#include <tdesimpleconfig.h> #include <kinputdialog.h> #include <kiconloader.h> #include <tdelistviewsearchline.h> @@ -17,7 +17,7 @@ KonqSidebar_Tree::KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name): KonqSidebarPlugin(instance,parent,widgetParent,desktopName_,name) { - KSimpleConfig ksc(desktopName_); + TDESimpleConfig ksc(desktopName_); ksc.setGroup("Desktop Entry"); int virt= ( (ksc.readEntry("X-TDE-TreeModule","")=="Virtual") ?VIRT_Folder:VIRT_Link); if (virt==1) desktopName_=ksc.readEntry("X-TDE-RelURL",""); @@ -34,25 +34,25 @@ KonqSidebar_Tree::KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidg TQLabel* slbl = new TQLabel(i18n("Se&arch:"), searchline); TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(searchline,tree); slbl->setBuddy(listViewSearch); - connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear())); + connect(clearSearch, TQ_SIGNAL(pressed()), listViewSearch, TQ_SLOT(clear())); } else tree=new KonqSidebarTree(this,widget,virt,desktopName_); - connect(tree, TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)), - this,TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &))); + connect(tree, TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)), + this,TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &))); - connect(tree,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), - this,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &))); + connect(tree,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), + this,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &))); - connect(tree,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )), - this,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ))); + connect(tree,TQ_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )), + this,TQ_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ))); - connect(tree,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), - this,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & ))); + connect(tree,TQ_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), + this,TQ_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & ))); - connect(tree,TQT_SIGNAL(enableAction( const char *, bool )), - this,TQT_SIGNAL(enableAction( const char *, bool))); + connect(tree,TQ_SIGNAL(enableAction( const char *, bool )), + this,TQ_SIGNAL(enableAction( const char *, bool))); } @@ -124,7 +124,7 @@ void KonqSidebar_Tree::rename() extern "C" { - KDE_EXPORT void* create_konqsidebar_tree(TDEInstance *inst,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) + TDE_EXPORT void* create_konqsidebar_tree(TDEInstance *inst,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { return new KonqSidebar_Tree(inst,par,widp,desktopname,name); } @@ -132,14 +132,14 @@ extern "C" extern "C" { - KDE_EXPORT bool add_konqsidebar_tree(TQString* fn, TQString*, TQMap<TQString,TQString> *map) + TDE_EXPORT bool add_konqsidebar_tree(TQString* fn, TQString*, TQMap<TQString,TQString> *map) { TDEStandardDirs *dirs=TDEGlobal::dirs(); TQStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true); TQStringList names; for (TQStringList::ConstIterator it=list.begin();it!=list.end();++it) { - KSimpleConfig sc(*it); + TDESimpleConfig sc(*it); sc.setGroup("Desktop Entry"); names<<sc.readEntry("Name"); } @@ -150,7 +150,7 @@ extern "C" { int id=names.findIndex( item ); if (id==-1) return false; - KSimpleConfig ksc2(*list.at(id)); + TDESimpleConfig ksc2(*list.at(id)); ksc2.setGroup("Desktop Entry"); map->insert("Type","Link"); map->insert("Icon",ksc2.readEntry("Icon")); diff --git a/konqueror/sidebar/trees/konqsidebar_tree.h b/konqueror/sidebar/trees/konqsidebar_tree.h index bdc58ad0c..25b616bd6 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.h +++ b/konqueror/sidebar/trees/konqsidebar_tree.h @@ -16,7 +16,7 @@ class TQVBox; class KonqSidebar_Tree: public KonqSidebarPlugin { - Q_OBJECT + TQ_OBJECT public: KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0); ~KonqSidebar_Tree(); |