diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /klipper/toplevel.cpp | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'klipper/toplevel.cpp')
| -rw-r--r-- | klipper/toplevel.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp index b16f5086f..1a8010cc2 100644 --- a/klipper/toplevel.cpp +++ b/klipper/toplevel.cpp @@ -206,8 +206,8 @@ KlipperWidget::KlipperWidget( TQWidget *parent, KConfig* config ) m_iconOrigHeight = height(); adjustSize(); - globalKeys = new KGlobalAccel(TQT_TQOBJECT(this)); - KGlobalAccel* keys = globalKeys; + globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this)); + TDEGlobalAccel* keys = globalKeys; #include "klipperbindings.cpp" // the keys need to be read from kdeglobals, not kickerrc --ellis, 22/9/02 globalKeys->readSettings(); @@ -337,7 +337,7 @@ void KlipperWidget::showPopupMenu( TQPopupMenu *menu ) } else { KWin::WindowInfo i = KWin::windowInfo( winId(), NET::WMGeometry ); TQRect g = i.geometry(); - TQRect screen = KGlobalSettings::desktopGeometry(g.center()); + TQRect screen = TDEGlobalSettings::desktopGeometry(g.center()); if ( g.x()-screen.x() > screen.width()/2 && g.y()-screen.y() + size.height() > screen.height() ) @@ -606,7 +606,7 @@ void KlipperWidget::slotQuit() saveSession(); int autoStart = KMessageBox::questionYesNoCancel( 0L, i18n("Should Klipper start automatically\nwhen you login?"), i18n("Automatically Start Klipper?"), i18n("Start"), i18n("Do Not Start") ); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("General"); if ( autoStart == KMessageBox::Yes ) { config->writeEntry("AutoStart", true); @@ -1176,8 +1176,8 @@ static void ensureGlobalSyncOff(KConfig* config) { true, true ); config->sync(); - KClipboardSynchronizer::setSynchronizing( false ); - KClipboardSynchronizer::setReverseSynchronizing( false ); + TDEClipboardSynchronizer::setSynchronizing( false ); + TDEClipboardSynchronizer::setReverseSynchronizing( false ); KIPC::sendMessageAll( KIPC::ClipboardConfigChanged, 0 ); } |