summaryrefslogtreecommitdiffstats
path: root/cervisia/cervisiashell.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:56 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:56 -0600
commite6aaa3624cc6179b82a9bfff1760e742a669064c (patch)
tree3fed4deb0540d34f85dfb53b02bea7519e66cc6f /cervisia/cervisiashell.cpp
parent4071ae43ea213cd0f7d5c344c939ebd97d097051 (diff)
downloadtdesdk-e6aaa3624cc6179b82a9bfff1760e742a669064c.tar.gz
tdesdk-e6aaa3624cc6179b82a9bfff1760e742a669064c.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'cervisia/cervisiashell.cpp')
-rw-r--r--cervisia/cervisiashell.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/cervisia/cervisiashell.cpp b/cervisia/cervisiashell.cpp
index 2e3ec62f..125df1ba 100644
--- a/cervisia/cervisiashell.cpp
+++ b/cervisia/cervisiashell.cpp
@@ -159,7 +159,7 @@ void CervisiaShell::slotConfigureKeys()
void CervisiaShell::slotConfigureToolBars()
{
- saveMainWindowSettings( KGlobal::config(), autoSaveGroup() );
+ saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
KEditToolbar dlg( factory() );
connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig()));
dlg.exec();
@@ -167,7 +167,7 @@ void CervisiaShell::slotConfigureToolBars()
void CervisiaShell::slotNewToolbarConfig()
{
- applyMainWindowSettings( KGlobal::config(), autoSaveGroup() );
+ applyMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
}
bool CervisiaShell::queryExit()
@@ -203,7 +203,7 @@ void CervisiaShell::saveProperties(KConfig* config)
void CervisiaShell::readSettings()
{
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup("Session");
readProperties(config);
@@ -212,7 +212,7 @@ void CervisiaShell::readSettings()
void CervisiaShell::writeSettings()
{
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup("Session");
saveProperties(config);