diff options
Diffstat (limited to 'konqueror/sidebar/trees/konq_sidebartree.cpp')
| -rw-r--r-- | konqueror/sidebar/trees/konq_sidebartree.cpp | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index 77e4f640b..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()); @@ -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; @@ -909,21 +909,21 @@ void KonqSidebarTree::showToplevelContextMenu() { 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("Rename"), 0, this, - TQT_SLOT( slotRename() ), m_collection, "rename"); + TQ_SLOT( slotRename() ), m_collection, "rename"); (void) new TDEAction( i18n("Delete Link"), "edit-delete", 0, this, - TQT_SLOT( slotDelete() ), m_collection, "delete_link"); + TQ_SLOT( slotDelete() ), m_collection, "delete_link"); (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("Copy Link Address"), "edit-copy", 0, this, - TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location"); + TQ_SLOT( slotCopyLocation() ), m_collection, "copy_location"); } TQPopupMenu *menu = new TQPopupMenu; @@ -1023,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() ); } @@ -1031,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 ); } /////////////////////////////////////////////////////////////////// |