summaryrefslogtreecommitdiffstats
path: root/tdeui/kmainwindow.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:22 -0600
commit28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch)
tree7b7a01768b3781763186c825af21bb14717d2c32 /tdeui/kmainwindow.cpp
parent07c48c43ff72c237e4028154f4594102b798073f (diff)
downloadtdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz
tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/kmainwindow.cpp')
-rw-r--r--tdeui/kmainwindow.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tdeui/kmainwindow.cpp b/tdeui/kmainwindow.cpp
index 5d2a1e705..487d4f197 100644
--- a/tdeui/kmainwindow.cpp
+++ b/tdeui/kmainwindow.cpp
@@ -430,7 +430,7 @@ KXMLGUIFactory *KMainWindow::guiFactory()
int KMainWindow::configureToolbars()
{
- saveMainWindowSettings(KGlobal::config());
+ saveMainWindowSettings(TDEGlobal::config());
KEditToolbar dlg(actionCollection(), xmlFile(), true, this);
connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(saveNewToolbarConfig()));
return dlg.exec();
@@ -439,7 +439,7 @@ int KMainWindow::configureToolbars()
void KMainWindow::saveNewToolbarConfig()
{
createGUI(xmlFile());
- applyMainWindowSettings( KGlobal::config() );
+ applyMainWindowSettings( TDEGlobal::config() );
}
void KMainWindow::setupGUI( int options, const TQString & xmlfile ) {
@@ -1026,7 +1026,7 @@ void KMainWindow::setAutoSaveSettings( const TQString & groupName, bool saveWind
this, TQT_SLOT( setSettingsDirty() ) );
// Now read the previously saved settings
- applyMainWindowSettings( KGlobal::config(), groupName );
+ applyMainWindowSettings( TDEGlobal::config(), groupName );
}
void KMainWindow::resetAutoSaveSettings()
@@ -1050,8 +1050,8 @@ void KMainWindow::saveAutoSaveSettings()
{
Q_ASSERT( d->autoSaveSettings );
//kdDebug(200) << "KMainWindow::saveAutoSaveSettings -> saving settings" << endl;
- saveMainWindowSettings( KGlobal::config(), d->autoSaveGroup );
- KGlobal::config()->sync();
+ saveMainWindowSettings( TDEGlobal::config(), d->autoSaveGroup );
+ TDEGlobal::config()->sync();
d->settingsDirty = false;
if ( d->settingsTimer )
d->settingsTimer->stop();