diff options
author | Timothy Pearson <[email protected]> | 2013-01-25 00:06:03 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-25 00:06:03 -0600 |
commit | 3b974934d9123068efc34d59b335263b91590a06 (patch) | |
tree | a81997aeae8b109f8280ce271e09b46fc9d5ea55 /src/part | |
parent | 40a94e488f56f1e783636b6414da7a3c4cadc86e (diff) | |
download | filelight-3b974934d9123068efc34d59b335263b91590a06.tar.gz filelight-3b974934d9123068efc34d59b335263b91590a06.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'src/part')
-rw-r--r-- | src/part/Config.cpp | 8 | ||||
-rw-r--r-- | src/part/Config.h | 4 | ||||
-rw-r--r-- | src/part/progressBox.cpp | 2 | ||||
-rw-r--r-- | src/part/progressBox.h | 2 | ||||
-rw-r--r-- | src/part/radialMap/widget.h | 4 | ||||
-rw-r--r-- | src/part/radialMap/widgetEvents.cpp | 6 | ||||
-rw-r--r-- | src/part/remoteLister.cpp | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/src/part/Config.cpp b/src/part/Config.cpp index 2da592d..3b4a925 100644 --- a/src/part/Config.cpp +++ b/src/part/Config.cpp @@ -17,10 +17,10 @@ Filelight::MapScheme Config::scheme; TQStringList Config::skipList; -inline KConfig& +inline TDEConfig& Filelight::Config::kconfig() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup( "filelight_part" ); return *config; } @@ -28,7 +28,7 @@ Filelight::Config::kconfig() void Filelight::Config::read() { - const KConfig &config = kconfig(); + const TDEConfig &config = kconfig(); scanAcrossMounts = config.readBoolEntry( "scanAcrossMounts", false ); scanRemoteMounts = config.readBoolEntry( "scanRemoteMounts", false ); @@ -47,7 +47,7 @@ Filelight::Config::read() void Filelight::Config::write() { - KConfig &config = kconfig(); + TDEConfig &config = kconfig(); config.writeEntry( "scanAcrossMounts", scanAcrossMounts ); config.writeEntry( "scanRemoteMounts", scanRemoteMounts ); diff --git a/src/part/Config.h b/src/part/Config.h index 7aad62a..47e6cf5 100644 --- a/src/part/Config.h +++ b/src/part/Config.h @@ -4,7 +4,7 @@ #include <tqstringlist.h> -class KConfig; +class TDEConfig; namespace Filelight @@ -13,7 +13,7 @@ namespace Filelight class Config { - static KConfig& kconfig(); + static TDEConfig& kconfig(); public: static void read(); diff --git a/src/part/progressBox.cpp b/src/part/progressBox.cpp index 0cc99f3..03c4275 100644 --- a/src/part/progressBox.cpp +++ b/src/part/progressBox.cpp @@ -23,7 +23,7 @@ ProgressBox::ProgressBox( TQWidget *parent, TQObject *part ) setMinimumWidth( sizeHint().width() ); connect( &m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(report()) ); - connect( part, TQT_SIGNAL(started( KIO::Job* )), TQT_SLOT(start()) ); + connect( part, TQT_SIGNAL(started( TDEIO::Job* )), TQT_SLOT(start()) ); connect( part, TQT_SIGNAL(completed()), TQT_SLOT(stop()) ); connect( part, TQT_SIGNAL(canceled( const TQString& )), TQT_SLOT(halt()) ); } diff --git a/src/part/progressBox.h b/src/part/progressBox.h index c7cf61e..7bfa882 100644 --- a/src/part/progressBox.h +++ b/src/part/progressBox.h @@ -7,7 +7,7 @@ #include <tqlabel.h> #include <tqtimer.h> -namespace KIO { class Job; } +namespace TDEIO { class Job; } class ProgressBox : public TQLabel diff --git a/src/part/radialMap/widget.h b/src/part/radialMap/widget.h index 61227a0..3b8ae00 100644 --- a/src/part/radialMap/widget.h +++ b/src/part/radialMap/widget.h @@ -11,7 +11,7 @@ template <class T> class Chain; class Directory; class File; -namespace KIO { class Job; } +namespace TDEIO { class Job; } class KURL; namespace RadialMap @@ -76,7 +76,7 @@ namespace RadialMap private slots: void resizeTimeout(); void sendFakeMouseEvent(); - void deleteJobFinished( KIO::Job* ); + void deleteJobFinished( TDEIO::Job* ); void createFromCache( const Directory* ); signals: diff --git a/src/part/radialMap/widgetEvents.cpp b/src/part/radialMap/widgetEvents.cpp index ca75c2f..44214c1 100644 --- a/src/part/radialMap/widgetEvents.cpp +++ b/src/part/radialMap/widgetEvents.cpp @@ -211,9 +211,9 @@ RadialMap::Widget::mousePressEvent( TQMouseEvent *e ) TQString(), KGuiItem( i18n("&Delete"), "editdelete" ) ); if (userIntention == KMessageBox::Continue) { - KIO::Job *job = KIO::del( url ); + TDEIO::Job *job = TDEIO::del( url ); job->setWindow( this ); - connect( job, TQT_SIGNAL(result( KIO::Job* )), TQT_SLOT(deleteJobFinished( KIO::Job* )) ); + connect( job, TQT_SIGNAL(result( TDEIO::Job* )), TQT_SLOT(deleteJobFinished( TDEIO::Job* )) ); TQApplication::setOverrideCursor( KCursor::workingCursor() ); } } @@ -246,7 +246,7 @@ RadialMap::Widget::mousePressEvent( TQMouseEvent *e ) } void -RadialMap::Widget::deleteJobFinished( KIO::Job *job ) +RadialMap::Widget::deleteJobFinished( TDEIO::Job *job ) { TQApplication::restoreOverrideCursor(); if( !job->error() ) diff --git a/src/part/remoteLister.cpp b/src/part/remoteLister.cpp index f18691a..834e9cd 100644 --- a/src/part/remoteLister.cpp +++ b/src/part/remoteLister.cpp @@ -70,7 +70,7 @@ namespace Filelight setShowingDotFiles( true ); //stupid KDirLister API function names setMainWindow( parent ); - //use TQT_SIGNAL(result(KIO::Job*)) instead and then use Job::error() + //use TQT_SIGNAL(result(TDEIO::Job*)) instead and then use Job::error() connect( this, TQT_SIGNAL(completed()), TQT_SLOT(completed()) ); connect( this, TQT_SIGNAL(canceled()), TQT_SLOT(canceled()) ); |