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/taskmanager/taskmanager.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/taskmanager/taskmanager.cpp')
-rw-r--r-- | kicker/taskmanager/taskmanager.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp index 2ae85819c..b5bcf40e1 100644 --- a/kicker/taskmanager/taskmanager.cpp +++ b/kicker/taskmanager/taskmanager.cpp @@ -60,7 +60,7 @@ TaskManager::TaskManager() m_winModule(new KWinModule()), m_trackGeometry(false) { - KGlobal::locale()->insertCatalogue("libtaskmanager"); + TDEGlobal::locale()->insertCatalogue("libtaskmanager"); connect(m_winModule, TQT_SIGNAL(windowAdded(WId)), this, TQT_SLOT(windowAdded(WId))); connect(m_winModule, TQT_SIGNAL(windowRemoved(WId)), @@ -88,7 +88,7 @@ TaskManager::TaskManager() TaskManager::~TaskManager() { - KGlobal::locale()->removeCatalogue("libtaskmanager"); + TDEGlobal::locale()->removeCatalogue("libtaskmanager"); } void TaskManager::configure_startup() @@ -628,7 +628,7 @@ Task::Task(WId win, TQObject *parent, const char *name) // try to guess the icon from the classhint if(_pixmap.isNull()) { - KGlobal::iconLoader()->loadIcon(className().lower(), + TDEGlobal::iconLoader()->loadIcon(className().lower(), KIcon::Small, KIcon::Small, KIcon::DefaultState, @@ -709,7 +709,7 @@ void Task::refreshIcon() // try to guess the icon from the classhint if(_pixmap.isNull()) { - KGlobal::iconLoader()->loadIcon(className().lower(), + TDEGlobal::iconLoader()->loadIcon(className().lower(), KIcon::Small, KIcon::Small, KIcon::DefaultState, @@ -914,7 +914,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon ) // Icon of last resort if( pixmap.isNull() ) { - pixmap = KGlobal::iconLoader()->loadIcon( "go", + pixmap = TDEGlobal::iconLoader()->loadIcon( "go", KIcon::NoGroup, KIcon::SizeSmall ); isStaticIcon = true; @@ -937,7 +937,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon ) // Icon of last resort if( pixmap.isNull() ) { - pixmap = KGlobal::iconLoader()->loadIcon( "go", + pixmap = TDEGlobal::iconLoader()->loadIcon( "go", KIcon::NoGroup, KIcon::SizeMedium ); isStaticIcon = true; @@ -951,7 +951,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon ) // If not, try to get one from the classname if ( pixmap.isNull() || pixmap.width() != size || pixmap.height() != size ) { - pixmap = KGlobal::iconLoader()->loadIcon( className(), + pixmap = TDEGlobal::iconLoader()->loadIcon( className(), KIcon::NoGroup, size, KIcon::DefaultState, @@ -968,7 +968,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon ) // Icon of last resort if( pixmap.isNull() ) { - pixmap = KGlobal::iconLoader()->loadIcon( "go", + pixmap = TDEGlobal::iconLoader()->loadIcon( "go", KIcon::NoGroup, size ); isStaticIcon = true; |