diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kicker/applets/minipager | |
parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kicker/applets/minipager')
-rw-r--r-- | kicker/applets/minipager/pagerapplet.cpp | 10 | ||||
-rw-r--r-- | kicker/applets/minipager/pagerapplet.h | 2 | ||||
-rw-r--r-- | kicker/applets/minipager/pagerbutton.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp index 6ab7febf5..c6a2fdc93 100644 --- a/kicker/applets/minipager/pagerapplet.cpp +++ b/kicker/applets/minipager/pagerapplet.cpp @@ -75,7 +75,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("kminipagerapplet"); + TDEGlobal::locale()->insertCatalogue("kminipagerapplet"); return new KMiniPager(configFile, KPanelApplet::Normal, 0, parent, "kminipagerapplet"); } } @@ -112,7 +112,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions, m_group->setFrameStyle(TQFrame::NoFrame); m_group->setExclusive( true ); - setFont( KGlobalSettings::taskbarFont() ); + setFont( TDEGlobalSettings::taskbarFont() ); m_twin = new KWinModule(TQT_TQOBJECT(this)); m_activeWindow = m_twin->activeWindow(); @@ -164,7 +164,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions, KMiniPager::~KMiniPager() { - KGlobal::locale()->removeCatalogue("kminipagerapplet"); + TDEGlobal::locale()->removeCatalogue("kminipagerapplet"); delete m_contextMenu; delete m_settings; delete m_shadowEngine; @@ -897,10 +897,10 @@ void KMiniPager::showPager() TQString strAppPath(locate("exe", "kpager")); if (!strAppPath.isEmpty()) { - KProcess process; + TDEProcess process; process << strAppPath; process << "--hidden"; - process.start(KProcess::DontCare); + process.start(TDEProcess::DontCare); } } } diff --git a/kicker/applets/minipager/pagerapplet.h b/kicker/applets/minipager/pagerapplet.h index 9aa370016..9abe65f34 100644 --- a/kicker/applets/minipager/pagerapplet.h +++ b/kicker/applets/minipager/pagerapplet.h @@ -37,7 +37,7 @@ class TQButtonGroup; class TQGridLayout; class TQTimer; -class KProcess; +class TDEProcess; class KWinModule; class KTextShadowEngine; class KSelectionOwner; diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp index b7a1590c5..b9af7efc0 100644 --- a/kicker/applets/minipager/pagerbutton.cpp +++ b/kicker/applets/minipager/pagerbutton.cpp @@ -576,7 +576,7 @@ void KMiniPagerButton::mouseMoveEvent(TQMouseEvent* e) } if (m_currentWindow && !m_pager->clickPos.isNull() && - (m_pager->clickPos - e->pos()).manhattanLength() > KGlobalSettings::dndEventDelay()) + (m_pager->clickPos - e->pos()).manhattanLength() > TDEGlobalSettings::dndEventDelay()) { TQRect r = m_currentWindow->geometry(); |