diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:06:03 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:06:03 -0600 |
| commit | 3b974934d9123068efc34d59b335263b91590a06 (patch) | |
| tree | a81997aeae8b109f8280ce271e09b46fc9d5ea55 /src/app/mainWindow.cpp | |
| 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/app/mainWindow.cpp')
| -rw-r--r-- | src/app/mainWindow.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/app/mainWindow.cpp b/src/app/mainWindow.cpp index fa5d365..b7f99ec 100644 --- a/src/app/mainWindow.cpp +++ b/src/app/mainWindow.cpp @@ -57,7 +57,7 @@ MainWindow::MainWindow() KMessageBox::error( this, i18n("Filelight is not installed properly, consequently its menus and toolbars will appear reduced or even empty") ); delete buttons; - connect( m_part, TQT_SIGNAL(started( KIO::Job* )), TQT_SLOT(scanStarted()) ); + connect( m_part, TQT_SIGNAL(started( TDEIO::Job* )), TQT_SLOT(scanStarted()) ); connect( m_part, TQT_SIGNAL(completed()), TQT_SLOT(scanCompleted()) ); connect( m_part, TQT_SIGNAL(canceled( const TQString& )), TQT_SLOT(scanFailed()) ); @@ -65,7 +65,7 @@ MainWindow::MainWindow() connect( m_part, TQT_SIGNAL(canceled( const TQString& )), m_histories, TQT_SLOT(stop()) ); connect( BrowserExtension::childObject( m_part ), TQT_SIGNAL(openURLNotify()), TQT_SLOT(urlAboutToChange()) ); - KConfig* const config = TDEGlobal::config(); + TDEConfig* const config = TDEGlobal::config(); config->setGroup( "general" ); m_combo->setHistoryItems( config->readPathListEntry( "comboHistory" ) ); applyMainWindowSettings( config, "window" ); @@ -114,7 +114,7 @@ MainWindow::queryExit() if( !m_part ) //apparently std::exit() still calls this function, and abort() causes a crash.. return true; - KConfig* const config = TDEGlobal::config(); + TDEConfig* const config = TDEGlobal::config(); saveMainWindowSettings( config, "window" ); m_recentScans->saveEntries( config ); @@ -237,14 +237,14 @@ MainWindow::urlAboutToChange() **********************************************/ void -MainWindow::saveProperties( KConfig *config ) //virtual +MainWindow::saveProperties( TDEConfig *config ) //virtual { m_histories->save( config ); config->writeEntry( "currentMap", m_part->url().path() ); } void -MainWindow::readProperties( KConfig *config ) //virtual +MainWindow::readProperties( TDEConfig *config ) //virtual { m_histories->restore( config ); slotScanPath( config->readEntry( "currentMap", TQString() ) ); |