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 /kicker/applets/minipager/pagerapplet.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 'kicker/applets/minipager/pagerapplet.cpp')
| -rw-r--r-- | kicker/applets/minipager/pagerapplet.cpp | 10 |
1 files changed, 5 insertions, 5 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); } } } |