From 4c097708c4cc24f3b8e4c21f14644f5715767d47 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:40:51 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kicker-applets/kbinaryclock/kbinaryclock.cpp | 20 ++++++++++---------- kicker-applets/kolourpicker/kolourpicker.cpp | 4 ++-- kicker-applets/kolourpicker/simplebutton.cpp | 2 +- kicker-applets/ktimemon/timemon.cc | 16 ++++++++-------- kicker-applets/ktimemon/timemon.h | 4 ++-- kicker-applets/math/mathapplet.cpp | 8 ++++---- kicker-applets/mediacontrol/mediacontrol.cpp | 4 ++-- kicker-applets/mediacontrol/mediacontrolconfig.cpp | 4 ++-- kicker-applets/mediacontrol/simplebutton.cpp | 2 +- 9 files changed, 32 insertions(+), 32 deletions(-) (limited to 'kicker-applets') diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp index 73319c5..2e84474 100644 --- a/kicker-applets/kbinaryclock/kbinaryclock.cpp +++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp @@ -42,7 +42,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile ) { - KGlobal::locale()->insertCatalogue( "kbinaryclock"); + TDEGlobal::locale()->insertCatalogue( "kbinaryclock"); return new KBinaryClock( configFile, KPanelApplet::Normal, KPanelApplet::Preferences, parent, "kbinaryclock"); } @@ -145,7 +145,7 @@ KBinaryClock::KBinaryClock(const TQString& configFile, Type type, int actions, T KBinaryClock::~KBinaryClock() { delete prefs; - KGlobal::locale()->removeCatalogue( "kbinaryclock"); + TDEGlobal::locale()->removeCatalogue( "kbinaryclock"); } /** @@ -227,7 +227,7 @@ void KBinaryClock::preferences(){ */ void KBinaryClock::updateClock(){ TQString time = "hhmmss"; - if(KGlobal::locale()->use12Clock()) + if(TDEGlobal::locale()->use12Clock()) time += "ap"; TQString currentTime = (TQTime::currentTime()).toString(time); @@ -289,7 +289,7 @@ void KBinaryClock::openContextMenu() { KPopupMenu *menu = new KPopupMenu(); menu->insertTitle( SmallIcon( "clock" ), i18n( "KBinaryClock" ) ); - KLocale *loc = KGlobal::locale(); + KLocale *loc = TDEGlobal::locale(); TQDateTime dt = TQDateTime::currentDateTime(); KPopupMenu *copyMenu = new KPopupMenu( menu ); @@ -320,7 +320,7 @@ void KBinaryClock::openContextMenu() { } int result = menu->exec( TQCursor::pos() ); - KProcess proc; + TDEProcess proc; switch (result) { case 102: preferences(); @@ -330,13 +330,13 @@ void KBinaryClock::openContextMenu() { proc << "--nonewdcop"; proc << TQString("%1 clock --lang %2") .arg(locate("exe", "kcmshell")) - .arg(KGlobal::locale()->language()); - proc.start(KProcess::DontCare); + .arg(TDEGlobal::locale()->language()); + proc.start(TDEProcess::DontCare); break; case 104: proc << locate("exe", "kcmshell"); proc << "language"; - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); break; case 110: preferences(); @@ -379,7 +379,7 @@ void KBinaryClock::toggleCalendar() } // make calendar fully visible - TQRect deskR = KGlobalSettings::desktopGeometry(TQPoint(0,0)); + TQRect deskR = TDEGlobalSettings::desktopGeometry(TQPoint(0,0)); if (c.y()+h > deskR.bottom()) c.setY(deskR.bottom()-h-1); if (c.x()+w > deskR.right()) c.setX(deskR.right()-w-1); @@ -405,7 +405,7 @@ ClockAppletToolTip::ClockAppletToolTip( KBinaryClock *clock ) : TQToolTip( clock void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ ) { - tip(m_clock->geometry(), KGlobal::locale()->formatDate(TQDateTime::currentDateTime().date(), false)); + tip(m_clock->geometry(), TDEGlobal::locale()->formatDate(TQDateTime::currentDateTime().date(), false)); } #include "kbinaryclock.moc" diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp index a51229e..58dc30c 100644 --- a/kicker-applets/kolourpicker/kolourpicker.cpp +++ b/kicker-applets/kolourpicker/kolourpicker.cpp @@ -50,7 +50,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("kolourpicker"); + TDEGlobal::locale()->insertCatalogue("kolourpicker"); return new KolourPicker(configFile, KPanelApplet::Normal, KPanelApplet::About, parent, "kolourpicker"); @@ -100,7 +100,7 @@ KolourPicker::KolourPicker(const TQString& configFile, Type type, KolourPicker::~KolourPicker() { - KGlobal::locale()->removeCatalogue("kolourpicker"); + TDEGlobal::locale()->removeCatalogue("kolourpicker"); } diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp index 2706af2..1a2631e 100644 --- a/kicker-applets/kolourpicker/simplebutton.cpp +++ b/kicker-applets/kolourpicker/simplebutton.cpp @@ -147,7 +147,7 @@ void SimpleButton::slotSettingsChanged(int category) return; } - bool changeCursor = KGlobalSettings::changeCursorOverIcon(); + bool changeCursor = TDEGlobalSettings::changeCursorOverIcon(); if (changeCursor) { diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cc index 991a2e9..ef32118 100644 --- a/kicker-applets/ktimemon/timemon.cc +++ b/kicker-applets/ktimemon/timemon.cc @@ -37,7 +37,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("ktimemon"); + TDEGlobal::locale()->insertCatalogue("ktimemon"); KTimeMon *mon = new KTimeMon(configFile, KPanelApplet::Normal, KPanelApplet::Preferences, parent, "ktimemon"); return mon; @@ -172,9 +172,9 @@ void KTimeMon::maybeTip(const TQPoint& p) idle = 0; TQString str = i18n("cpu: %1% idle\nmem: %2 MB %3% free\nswap: %4 MB %5% free") .arg(idle) - .arg(KGlobal::locale()->formatNumber(s.used/100.*s.mtotal, 0)) + .arg(TDEGlobal::locale()->formatNumber(s.used/100.*s.mtotal, 0)) .arg(100-s.used) - .arg(KGlobal::locale()->formatNumber(s.stotal, 0)) + .arg(TDEGlobal::locale()->formatNumber(s.stotal, 0)) .arg(100-s.sused); tip(rect(), str); @@ -265,7 +265,7 @@ KTimeMon::~KTimeMon() { delete sample; delete bgProcess; - KGlobal::locale()->removeCatalogue("ktimemon"); + TDEGlobal::locale()->removeCatalogue("ktimemon"); } @@ -413,15 +413,15 @@ void KTimeMon::runCommand(int index) bgProcess = new KShellProcess; *bgProcess << mouseActionCommand[index]; - connect(bgProcess, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - this, TQT_SLOT(commandStderr(KProcess *, char *, int))); - bgProcess->start(KProcess::DontCare, KProcess::Stderr); + connect(bgProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQT_SLOT(commandStderr(TDEProcess *, char *, int))); + bgProcess->start(TDEProcess::DontCare, TDEProcess::Stderr); } // ----------------------------------------------------------------------------- // Check if there is any diagnostic output (command not found or such) -void KTimeMon::commandStderr(KProcess * /*proc*/, char *buffer, int /*length*/) +void KTimeMon::commandStderr(TDEProcess * /*proc*/, char *buffer, int /*length*/) { TQString msgbuf; diff --git a/kicker-applets/ktimemon/timemon.h b/kicker-applets/ktimemon/timemon.h index 4268c06..6e454d8 100644 --- a/kicker-applets/ktimemon/timemon.h +++ b/kicker-applets/ktimemon/timemon.h @@ -29,7 +29,7 @@ class KConfDialog; class TQPaintEvent; class TQMouseEvent; class TQPainter; -class KProcess; +class TDEProcess; class KShellProcess; class KHelpMenu; class KPopupMenu; @@ -79,7 +79,7 @@ protected: private slots: // called from the menu void configure(); // show the configuration dialog void orientation(); // switch vertical/horizontal orientation - void commandStderr(KProcess *proc, char *buffer, int length); + void commandStderr(TDEProcess *proc, char *buffer, int length); private: void runCommand(int index); diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp index 37e0bd6..7051e68 100644 --- a/kicker-applets/math/mathapplet.cpp +++ b/kicker-applets/math/mathapplet.cpp @@ -51,7 +51,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("kmathapplet"); + TDEGlobal::locale()->insertCatalogue("kmathapplet"); return new MathApplet(configFile, KPanelApplet::Stretch, 0, parent, "kmathapplet"); } } @@ -99,8 +99,8 @@ MathApplet::MathApplet(const TQString& configFile, Type type, int actions, _input->completionObject()->setItems(list); list = c->readListEntry("History list"); _input->setHistoryItems(list); - int mode = c->readNumEntry( "CompletionMode", KGlobalSettings::completionMode() ); - _input->setCompletionMode( (KGlobalSettings::Completion) mode ); + int mode = c->readNumEntry( "CompletionMode", TDEGlobalSettings::completionMode() ); + _input->setCompletionMode( (TDEGlobalSettings::Completion) mode ); _hbox = new TQHBox( 0, 0, WStyle_Customize | WType_Popup ); _hbox->setFixedSize(120, 22); @@ -131,7 +131,7 @@ MathApplet::~MathApplet() c->writeEntry( "CompletionMode", (int) _input->completionMode() ); c->sync(); - KGlobal::locale()->removeCatalogue("kmathapplet"); + TDEGlobal::locale()->removeCatalogue("kmathapplet"); } void MathApplet::useDegrees() { diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp index 99c79c6..c320ff9 100644 --- a/kicker-applets/mediacontrol/mediacontrol.cpp +++ b/kicker-applets/mediacontrol/mediacontrol.cpp @@ -59,7 +59,7 @@ extern "C" { KDE_EXPORT KPanelApplet *init( TQWidget *parent, const TQString &configFile) { - KGlobal::locale()->insertCatalogue("mediacontrol"); + TDEGlobal::locale()->insertCatalogue("mediacontrol"); return new MediaControl(configFile, KPanelApplet::Normal, KPanelApplet::About | KPanelApplet::Preferences | KPanelApplet::ReportBug, parent, "mediacontrol"); @@ -163,7 +163,7 @@ MediaControl::~MediaControl() delete _player; delete _configFrontend; delete _dcopClient; - KGlobal::locale()->removeCatalogue("mediacontrol"); + TDEGlobal::locale()->removeCatalogue("mediacontrol"); } // Drag-n-Drop stuff =========================================================== diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.cpp b/kicker-applets/mediacontrol/mediacontrolconfig.cpp index 6df8886..14e92fa 100644 --- a/kicker-applets/mediacontrol/mediacontrolconfig.cpp +++ b/kicker-applets/mediacontrol/mediacontrolconfig.cpp @@ -63,8 +63,8 @@ MediaControlConfig::MediaControlConfig( ConfigFrontend *cfg, TQWidget *parent, c _child->themeListBox->clear(); // fill with available skins - KGlobal::dirs()->addResourceType("themes", KStandardDirs::kde_default("data") + "mediacontrol"); - TQStringList list = KGlobal::dirs()->resourceDirs("themes"); + TDEGlobal::dirs()->addResourceType("themes", KStandardDirs::kde_default("data") + "mediacontrol"); + TQStringList list = TDEGlobal::dirs()->resourceDirs("themes"); for (TQStringList::ConstIterator it = list.constBegin(); it != list.constEnd(); ++it) readSkinDir(*it); diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp index 2706af2..1a2631e 100644 --- a/kicker-applets/mediacontrol/simplebutton.cpp +++ b/kicker-applets/mediacontrol/simplebutton.cpp @@ -147,7 +147,7 @@ void SimpleButton::slotSettingsChanged(int category) return; } - bool changeCursor = KGlobalSettings::changeCursorOverIcon(); + bool changeCursor = TDEGlobalSettings::changeCursorOverIcon(); if (changeCursor) { -- cgit v1.2.1