diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:40:41 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:40:41 -0600 |
| commit | 0b54abbdf80cef08e5cb8ef7b8b7af31c54dd9b4 (patch) | |
| tree | 322767e10a0d28887f54f3cefe6399098713dc82 /kmag | |
| parent | 11f5b1c38c194ef53638bafa0df70e821a7a6427 (diff) | |
| download | tdeaccessibility-0b54abbdf80cef08e5cb8ef7b8b7af31c54dd9b4.tar.gz tdeaccessibility-0b54abbdf80cef08e5cb8ef7b8b7af31c54dd9b4.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmag')
| -rw-r--r-- | kmag/kmag.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp index 3feea65..af844a3 100644 --- a/kmag/kmag.cpp +++ b/kmag/kmag.cpp @@ -230,7 +230,7 @@ void KmagApp::initActions() m_pRotationBox->setWhatsThis(i18n("Select the rotation degree.")); m_pRotationBox->setToolTip(i18n("Rotation degree")); - // KHelpMenu *newHelpMenu = new KHelpMenu(this, KGlobal::instance()->aboutData()); + // KHelpMenu *newHelpMenu = new KHelpMenu(this, TDEGlobal::instance()->aboutData()); m_keyConf = KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( slotConfKeys() ), actionCollection(), "key_conf"); m_toolConf = KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotEditToolbars() ), @@ -933,7 +933,7 @@ void KmagApp::slotConfKeys() void KmagApp::slotEditToolbars() { - saveMainWindowSettings( KGlobal::config(), "MainWindow" ); + saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); KEditToolbar dlg( actionCollection() ); connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), TQT_TQOBJECT(this), TQT_SLOT( slotNewToolbarConfig() ) ); if ( dlg.exec() ) @@ -953,6 +953,6 @@ void KmagApp::contextMenu (TQPoint pos) void KmagApp::slotNewToolbarConfig() { - applyMainWindowSettings( KGlobal::config(), "MainWindow" ); + applyMainWindowSettings( TDEGlobal::config(), "MainWindow" ); createGUI(); } |