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/launcher | |
| 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/launcher')
| -rw-r--r-- | kicker/applets/launcher/quickbutton.cpp | 6 | ||||
| -rw-r--r-- | kicker/applets/launcher/quicklauncher.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp index 248614811..47228e620 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/kicker/applets/launcher/quickbutton.cpp @@ -132,7 +132,7 @@ TQPixmap QuickURL::pixmap( mode_t _mode, KIcon::Group _group, TQPixmap pxmap; // Load icon if (_kurl.url() == "SPECIAL_BUTTON__SHOW_DESKTOP") { - pxmap = KGlobal::iconLoader()->loadIcon("desktop", _group, _force_size, _state); + pxmap = TDEGlobal::iconLoader()->loadIcon("desktop", _group, _force_size, _state); } else { pxmap = KMimeType::pixmapForURL(_kurl, _mode, _group, _force_size, _state); @@ -231,7 +231,7 @@ void QuickButton::mouseMoveEvent(TQMouseEvent *e) { if ((e->state() & Qt::LeftButton) == 0) return; TQPoint p(e->pos() - _dragPos); - if (p.manhattanLength() <= KGlobalSettings::dndEventDelay()) + if (p.manhattanLength() <= TDEGlobalSettings::dndEventDelay()) return; DEBUGSTR<<"dragstart"<<endl<<flush; setDown(false); @@ -344,7 +344,7 @@ void QuickButton::updateKickerTip(KickerTip::Data &data) data.subtext = data.message; } if (_qurl->url() == "SPECIAL_BUTTON__SHOW_DESKTOP") { - data.icon = KGlobal::iconLoader()->loadIcon("desktop", KIcon::Panel, KIcon::SizeHuge, KIcon::DefaultState); + data.icon = TDEGlobal::iconLoader()->loadIcon("desktop", KIcon::Panel, KIcon::SizeHuge, KIcon::DefaultState); } else { data.icon = KMimeType::pixmapForURL(_qurl->kurl(), 0, KIcon::Panel, KIcon::SizeHuge, KIcon::DefaultState); diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp index 7c693fc8f..ee72d58bb 100644 --- a/kicker/applets/launcher/quicklauncher.cpp +++ b/kicker/applets/launcher/quicklauncher.cpp @@ -71,7 +71,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("quicklauncher"); + TDEGlobal::locale()->insertCatalogue("quicklauncher"); return new QuickLauncher(configFile, KPanelApplet::Normal, KPanelApplet::Preferences, parent, "quicklauncher"); @@ -143,7 +143,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions, QuickLauncher::~QuickLauncher() { - KGlobal::locale()->removeCatalogue("quicklauncher"); + TDEGlobal::locale()->removeCatalogue("quicklauncher"); setCustomMenu(0); delete m_popup; delete m_appletPopup; |