diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:19:01 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:19:01 -0600 |
| commit | 40a94e488f56f1e783636b6414da7a3c4cadc86e (patch) | |
| tree | 97f80ca640805f36d66bc9133baf9916c946a46d /src/app/mainWindow.cpp | |
| parent | aeecbb9b93a2ce6139d125f54c0cbec7fce3e8d4 (diff) | |
| download | filelight-40a94e488f56f1e783636b6414da7a3c4cadc86e.tar.gz filelight-40a94e488f56f1e783636b6414da7a3c4cadc86e.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/app/mainWindow.cpp')
| -rw-r--r-- | src/app/mainWindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/app/mainWindow.cpp b/src/app/mainWindow.cpp index 4302891..fa5d365 100644 --- a/src/app/mainWindow.cpp +++ b/src/app/mainWindow.cpp @@ -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 = KGlobal::config(); + KConfig* const config = TDEGlobal::config(); config->setGroup( "general" ); m_combo->setHistoryItems( config->readPathListEntry( "comboHistory" ) ); applyMainWindowSettings( config, "window" ); @@ -100,7 +100,7 @@ MainWindow::setupActions() //singleton function m_histories = new HistoryCollection( ac, TQT_TQOBJECT(this), "history_collection" ); ac->action( "scan_directory" )->setText( i18n( "&Scan Directory..." ) ); - m_recentScans->loadEntries( KGlobal::config() ); + m_recentScans->loadEntries( TDEGlobal::config() ); combo->setAutoSized( true ); //FIXME what does this do? connect( m_recentScans, TQT_SIGNAL(urlSelected( const KURL& )), TQT_SLOT(slotScanUrl( const KURL& )) ); @@ -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 = KGlobal::config(); + KConfig* const config = TDEGlobal::config(); saveMainWindowSettings( config, "window" ); m_recentScans->saveEntries( config ); |