From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:43:14 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- klipper/applet.cpp | 2 +- klipper/configdialog.cpp | 2 +- klipper/configdialog.h | 4 ++-- klipper/klipperpopup.cpp | 4 ++-- klipper/toplevel.cpp | 12 ++++++------ klipper/toplevel.h | 2 +- klipper/urlgrabber.cpp | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) (limited to 'klipper') diff --git a/klipper/applet.cpp b/klipper/applet.cpp index 97eee6eec..358209876 100644 --- a/klipper/applet.cpp +++ b/klipper/applet.cpp @@ -34,7 +34,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("klipper"); + TDEGlobal::locale()->insertCatalogue("klipper"); int actions = KPanelApplet::Preferences | KPanelApplet::About | KPanelApplet::Help; return new KlipperApplet(configFile, KPanelApplet::Normal, actions, parent, "klipper"); } diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp index d48f45b9c..2fcc23352 100644 --- a/klipper/configdialog.cpp +++ b/klipper/configdialog.cpp @@ -35,7 +35,7 @@ #include "configdialog.h" -ConfigDialog::ConfigDialog( const ActionList *list, KGlobalAccel *accel, +ConfigDialog::ConfigDialog( const ActionList *list, TDEGlobalAccel *accel, bool isApplet ) : KDialogBase( Tabbed, i18n("Configure"), Ok | Cancel | Help, diff --git a/klipper/configdialog.h b/klipper/configdialog.h index 514f40bc7..7db964b4c 100644 --- a/klipper/configdialog.h +++ b/klipper/configdialog.h @@ -35,7 +35,7 @@ #include "urlgrabber.h" -class KGlobalAccel; +class TDEGlobalAccel; class KKeyChooser; class KListView; class TQPushButton; @@ -137,7 +137,7 @@ class ConfigDialog : public KDialogBase Q_OBJECT public: - ConfigDialog( const ActionList *list, KGlobalAccel *accel, bool isApplet ); + ConfigDialog( const ActionList *list, TDEGlobalAccel *accel, bool isApplet ); ~ConfigDialog(); ActionList * actionList() const { return actionWidget->actionList(); } diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp index 3e2f9de72..3e1db75bd 100644 --- a/klipper/klipperpopup.cpp +++ b/klipper/klipperpopup.cpp @@ -107,7 +107,7 @@ KlipperPopup::KlipperPopup( History* history, TQWidget* parent, const char* name { KWin::WindowInfo i = KWin::windowInfo( winId(), NET::WMGeometry ); TQRect g = i.geometry(); - TQRect screen = KGlobalSettings::desktopGeometry(g.center()); + TQRect screen = TDEGlobalSettings::desktopGeometry(g.center()); int menu_height = ( screen.height() ) * 3/4; int menu_width = ( screen.width() ) * 1/3; @@ -167,7 +167,7 @@ void KlipperPopup::buildFromScratch() { action->plug( this, -1 ); } - if ( KGlobalSettings::insertTearOffHandle() ) { + if ( TDEGlobalSettings::insertTearOffHandle() ) { insertTearOffHandle(); } 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 ); } diff --git a/klipper/toplevel.h b/klipper/toplevel.h index 59d7c7396..b072bd187 100644 --- a/klipper/toplevel.h +++ b/klipper/toplevel.h @@ -59,7 +59,7 @@ public: ~KlipperWidget(); virtual void adjustSize(); - KGlobalAccel *globalKeys; + TDEGlobalAccel *globalKeys; /** * Get clipboard history (the "document") diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp index 7e2cc6bd4..f04bdf22f 100644 --- a/klipper/urlgrabber.cpp +++ b/klipper/urlgrabber.cpp @@ -251,14 +251,14 @@ void URLGrabber::execute( const struct ClipCommand *command, if ( cmdLine.isEmpty() ) return; - KProcess proc; + TDEProcess proc; const char *shell = getenv("KLIPPER_SHELL"); if (shell==NULL) shell = getenv("SHELL"); proc.setUseShell(true,shell); proc << cmdLine.stripWhiteSpace(); - if ( !proc.start(KProcess::DontCare, KProcess::NoCommunication )) + if ( !proc.start(TDEProcess::DontCare, TDEProcess::NoCommunication )) tqWarning("Klipper: Couldn't start process!"); } } -- cgit v1.2.1