diff options
Diffstat (limited to 'kicker')
75 files changed, 255 insertions, 255 deletions
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index ced1fb363..b29d52f19 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -218,7 +218,7 @@ PlainClock::PlainClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent, cons int PlainClock::preferedWidthForHeight(int ) const { - TQString maxLengthTime = KGlobal::locale()->formatTime( TQTime( 23, 59 ), _prefs->plainShowSeconds()); + TQString maxLengthTime = TDEGlobal::locale()->formatTime( TQTime( 23, 59 ), _prefs->plainShowSeconds()); return fontMetrics().width( maxLengthTime ) + 8; } @@ -231,7 +231,7 @@ int PlainClock::preferedHeightForWidth(int /*w*/) const void PlainClock::updateClock() { - TQString newStr = KGlobal::locale()->formatTime(_applet->clockGetTime(), _prefs->plainShowSeconds()); + TQString newStr = TDEGlobal::locale()->formatTime(_applet->clockGetTime(), _prefs->plainShowSeconds()); if (_force || newStr != _timeStr) { _timeStr = newStr; @@ -334,7 +334,7 @@ void DigitalClock::updateClock() if (_prefs->digitalShowSeconds()) format += sep + "%02d"; - if (KGlobal::locale()->use12Clock()) { + if (TDEGlobal::locale()->use12Clock()) { if (h > 12) h -= 12; else if( h == 0) @@ -940,8 +940,8 @@ ClockApplet::~ClockApplet() { delete m_shadowEngine; //reverse for the moment - KGlobal::locale()->removeCatalogue("clockapplet"); - KGlobal::locale()->removeCatalogue("timezones"); // For time zone translations + TDEGlobal::locale()->removeCatalogue("clockapplet"); + TDEGlobal::locale()->removeCatalogue("timezones"); // For time zone translations if (_calendar) { @@ -1019,7 +1019,7 @@ int ClockApplet::widthForHeight(int h) const { // if the date format STARTS with a year, assume it's in descending // order and should therefore PRECEED the date. - TQString dateFormat = KGlobal::locale()->dateFormatShort(); + TQString dateFormat = TDEGlobal::locale()->dateFormatShort(); dateFirst = dateFormat.at(1) == 'y' || dateFormat.at(1) == 'Y'; } @@ -1508,7 +1508,7 @@ void ClockApplet::contextMenuActivated(int result) return; }; - KProcess proc; + TDEProcess proc; switch (result) { case 102: @@ -1519,13 +1519,13 @@ void ClockApplet::contextMenuActivated(int result) proc << "--nonewdcop"; proc << TQString("%1 tde-clock.desktop --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 << "tde-language.desktop"; - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); break; case 110: preferences(true); @@ -1540,7 +1540,7 @@ void ClockApplet::aboutToShowContextMenu() menu->clear(); menu->insertTitle( SmallIcon( "clock" ), i18n( "Clock" ) ); - KLocale *loc = KGlobal::locale(); + KLocale *loc = TDEGlobal::locale(); TQDateTime dt = TQDateTime::currentDateTime(); dt = TQT_TQDATETIME_OBJECT(dt.addSecs(TZoffset)); @@ -1694,7 +1694,7 @@ void ClockApplet::positionChange(Position p) void ClockApplet::updateDateLabel(bool reLayout) { _lastDate = clockGetDate(); - _dayOfWeek->setText(KGlobal::locale()->calendar()->weekDayName(_lastDate)); + _dayOfWeek->setText(TDEGlobal::locale()->calendar()->weekDayName(_lastDate)); if (zone->zoneIndex() != 0) { @@ -1704,7 +1704,7 @@ void ClockApplet::updateDateLabel(bool reLayout) } else { - TQString dateStr = KGlobal::locale()->formatDate(_lastDate, true); + TQString dateStr = TDEGlobal::locale()->formatDate(_lastDate, true); _date->setText(dateStr); _date->setShown(showDate); } @@ -1728,9 +1728,9 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data) TQString activeZone = zone->zone(); if (zoneCount == 0) { - TQString _time = KGlobal::locale()->formatTime(clockGetTime(), + TQString _time = TDEGlobal::locale()->formatTime(clockGetTime(), _prefs->plainShowSeconds()); - TQString _date = KGlobal::locale()->formatDate(clockGetDate(), false); + TQString _date = TDEGlobal::locale()->formatDate(clockGetDate(), false); data.message = _time; data.subtext = _date; @@ -1754,9 +1754,9 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data) m_zone = i18n(m_zone.utf8()); // ensure it gets translated } - TQString _time = KGlobal::locale()->formatTime(clockGetTime(), + TQString _time = TDEGlobal::locale()->formatTime(clockGetTime(), _prefs->plainShowSeconds()); - TQString _date = KGlobal::locale()->formatDate(clockGetDate(), false); + TQString _date = TDEGlobal::locale()->formatDate(clockGetDate(), false); if (activeIndex == i) { @@ -1840,11 +1840,11 @@ void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ ) (m_clock->type() == Prefs::EnumType::Analog) ) { // show full time (incl. hour) as tooltip for Fuzzy clock - tipText = KGlobal::locale()->formatDateTime(TQT_TQDATETIME_OBJECT(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset))); + tipText = TDEGlobal::locale()->formatDateTime(TQT_TQDATETIME_OBJECT(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset))); } else { - tipText = KGlobal::locale()->formatDate(m_clock->clockGetDate()); + tipText = TDEGlobal::locale()->formatDate(m_clock->clockGetDate()); } if (m_clock->timezones() && m_clock->timezones()->zoneIndex() > 0) diff --git a/kicker/applets/clock/clockapplet.kcfg b/kicker/applets/clock/clockapplet.kcfg index e5b461e1c..91c043336 100644 --- a/kicker/applets/clock/clockapplet.kcfg +++ b/kicker/applets/clock/clockapplet.kcfg @@ -29,7 +29,7 @@ <entry name="DateFont" type="Font" key="Font"> <label>Font for the clock.</label> <code> -TQFont defFont=KGlobalSettings::generalFont(); +TQFont defFont=TDEGlobalSettings::generalFont(); defFont.setPointSize(8); </code> <default code="true">defFont</default> @@ -55,7 +55,7 @@ defFont.setPointSize(8); <entry name="PlainFont" type="Font" key="Font"> <label>Font for the clock.</label> <code> -defFont=KGlobalSettings::generalFont(); +defFont=TDEGlobalSettings::generalFont(); defFont.setPointSize(8); defFont.setBold(true); </code> @@ -162,7 +162,7 @@ defFont.setBold(true); <entry name="FuzzyFont" type="Font" key="Font"> <label>Font for the clock.</label> <code> -defFont=KGlobalSettings::generalFont(); +defFont=TDEGlobalSettings::generalFont(); </code> <default code="true">defFont</default> </entry> diff --git a/kicker/applets/clock/init.cpp b/kicker/applets/clock/init.cpp index a21a62757..9b89da87d 100644 --- a/kicker/applets/clock/init.cpp +++ b/kicker/applets/clock/init.cpp @@ -70,8 +70,8 @@ extern "C" { KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("clockapplet"); - KGlobal::locale()->insertCatalogue("timezones"); // For time zone translations + TDEGlobal::locale()->insertCatalogue("clockapplet"); + TDEGlobal::locale()->insertCatalogue("timezones"); // For time zone translations return new ClockApplet(configFile, KPanelApplet::Normal, KPanelApplet::Preferences, parent, "clockapplet"); } 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; diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp index daec7a98f..00187fb3f 100644 --- a/kicker/applets/lockout/lockout.cpp +++ b/kicker/applets/lockout/lockout.cpp @@ -48,7 +48,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("lockout"); + TDEGlobal::locale()->insertCatalogue("lockout"); return new Lockout(configFile, parent, "lockout"); } } @@ -105,7 +105,7 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name Lockout::~Lockout() { - KGlobal::locale()->removeCatalogue("lockout"); + TDEGlobal::locale()->removeCatalogue("lockout"); } // the -2 is due to kicker allowing us a width/height of 42 and the buttons diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp index 61aefd673..28d982e4f 100644 --- a/kicker/applets/media/mediaapplet.cpp +++ b/kicker/applets/media/mediaapplet.cpp @@ -35,7 +35,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile) { - KGlobal::locale()->insertCatalogue("mediaapplet"); + TDEGlobal::locale()->insertCatalogue("mediaapplet"); return new MediaApplet(configFile, KPanelApplet::Normal, KPanelApplet::About | KPanelApplet::Preferences, parent, "mediaapplet"); @@ -84,7 +84,7 @@ MediaApplet::~MediaApplet() delete b; } - KGlobal::locale()->removeCatalogue("mediaapplet"); + TDEGlobal::locale()->removeCatalogue("mediaapplet"); } void MediaApplet::about() diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp index 2b864e33a..1a0ab5ebe 100644 --- a/kicker/applets/menu/menuapplet.cpp +++ b/kicker/applets/menu/menuapplet.cpp @@ -61,7 +61,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init( TQWidget* parent_P, const TQString& configFile_P ) { - KGlobal::locale()->insertCatalogue("kmenuapplet"); + TDEGlobal::locale()->insertCatalogue("kmenuapplet"); return new KickerMenuApplet::Applet( configFile_P, parent_P ); } } @@ -102,7 +102,7 @@ Applet::~Applet() delete selection; delete selection_watcher; delete module; - KGlobal::locale()->removeCatalogue("kmenuapplet"); + TDEGlobal::locale()->removeCatalogue("kmenuapplet"); } void Applet::windowAdded( WId w_P ) 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(); diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp index c7b50d4a4..eb663814b 100644 --- a/kicker/applets/naughty/NaughtyApplet.cpp +++ b/kicker/applets/naughty/NaughtyApplet.cpp @@ -40,7 +40,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init(TQWidget * parent, const TQString & configFile) { - KGlobal::locale()->insertCatalogue("naughtyapplet"); + TDEGlobal::locale()->insertCatalogue("naughtyapplet"); return new NaughtyApplet ( @@ -63,7 +63,7 @@ NaughtyApplet::NaughtyApplet ) : KPanelApplet(configFile, t, actions, parent, name) { - KGlobal::iconLoader()->addAppDir("naughtyapplet"); + TDEGlobal::iconLoader()->addAppDir("naughtyapplet"); setBackgroundOrigin( AncestorOrigin ); button_ = new SimpleButton(this); @@ -99,7 +99,7 @@ NaughtyApplet::NaughtyApplet NaughtyApplet::~NaughtyApplet() { - KGlobal::locale()->removeCatalogue("naughtyapplet"); + TDEGlobal::locale()->removeCatalogue("naughtyapplet"); } void diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp index fb7ac107b..0f33f74d1 100644 --- a/kicker/applets/run/runapplet.cpp +++ b/kicker/applets/run/runapplet.cpp @@ -44,7 +44,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("krunapplet"); + TDEGlobal::locale()->insertCatalogue("krunapplet"); return new RunApplet(configFile, KPanelApplet::Stretch, 0, parent, "krunapplet"); } } @@ -87,8 +87,8 @@ RunApplet::RunApplet(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 ); _filterData = new KURIFilterData(); @@ -110,7 +110,7 @@ RunApplet::~RunApplet() c->sync(); delete _filterData; - KGlobal::locale()->removeCatalogue("krunapplet"); + TDEGlobal::locale()->removeCatalogue("krunapplet"); } void RunApplet::resizeEvent(TQResizeEvent*) diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp index 21a36f35b..b5910e3b0 100644 --- a/kicker/applets/swallow/swallow.cpp +++ b/kicker/applets/swallow/swallow.cpp @@ -255,7 +255,7 @@ void SwallowApplet::removeApplet( SwallowApp *app ) /////////////////////////////////////////////////////////////////// -static void parseCommand(KProcess *proc, TQString cmd) +static void parseCommand(TDEProcess *proc, TQString cmd) { int pos; @@ -282,15 +282,15 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent, this, TQT_SLOT(windowAdded(WId))); if (!swc->cmdline.isEmpty()) { - KProcess *process = new KProcess; + TDEProcess *process = new TDEProcess; parseCommand(process, swc->cmdline); // move window out of sight // *process << "-geometry"; // *process << TQString("32x32+%1+%2").arg(kapp->desktop()->width()).arg(kapp->desktop()->height()); - connect(process, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(processExited(KProcess*))); + connect(process, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(processExited(TDEProcess*))); process->start(); } @@ -340,7 +340,7 @@ void SwallowApp::windowAdded(WId win) } -void SwallowApp::processExited(KProcess *) +void SwallowApp::processExited(TDEProcess *) { SwallowApplet::removeApplet( this ); // also deletes this app } diff --git a/kicker/applets/swallow/swallow.h b/kicker/applets/swallow/swallow.h index 437c3fa8b..72795cc79 100644 --- a/kicker/applets/swallow/swallow.h +++ b/kicker/applets/swallow/swallow.h @@ -28,7 +28,7 @@ class TQBoxLayout; class KConfig; -class KProcess; +class TDEProcess; class KWinModule; class SwallowApp; @@ -61,7 +61,7 @@ public: // for KPanelApplet int heightForWidth( int h ); void windowAdded(WId win); - void processExited(KProcess *proc); + void processExited(TDEProcess *proc); public slots: virtual void preferences(); @@ -102,10 +102,10 @@ signals: protected slots: void windowAdded(WId win); - void processExited(KProcess *proc); + void processExited(TDEProcess *proc); private: - KProcess *process; + TDEProcess *process; TQString winTitle; float wh_ratio; diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 0079ee9f4..d10fd107e 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -64,7 +64,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("ksystemtrayapplet"); + TDEGlobal::locale()->insertCatalogue("ksystemtrayapplet"); return new SystemTrayApplet(configFile, KPanelApplet::Normal, KPanelApplet::Preferences, parent, "ksystemtrayapplet"); } @@ -201,7 +201,7 @@ SystemTrayApplet::~SystemTrayApplet() if (m_leftSpacer) delete m_leftSpacer; if (m_rightSpacer) delete m_rightSpacer; - KGlobal::locale()->removeCatalogue("ksystemtrayapplet"); + TDEGlobal::locale()->removeCatalogue("ksystemtrayapplet"); } bool SystemTrayApplet::x11Event( XEvent *e ) diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp index 083a7e597..2d72e23fe 100644 --- a/kicker/applets/taskbar/taskbarapplet.cpp +++ b/kicker/applets/taskbar/taskbarapplet.cpp @@ -41,7 +41,7 @@ extern "C" KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile ) { // FIXME: what about two taskbars? perhaps this should be inserted just once - KGlobal::locale()->insertCatalogue( "ktaskbarapplet" ); + TDEGlobal::locale()->insertCatalogue( "ktaskbarapplet" ); int options = 0; if (kapp->authorizeControlModule("tde-kcmtaskbar.desktop")) options = KPanelApplet::Preferences; @@ -67,7 +67,7 @@ TaskbarApplet::TaskbarApplet( const TQString& configFile, Type type, int actions TaskbarApplet::~TaskbarApplet() { // FIXME: what about TWO taskbars? - KGlobal::locale()->removeCatalogue( "ktaskbarapplet" ); + TDEGlobal::locale()->removeCatalogue( "ktaskbarapplet" ); } int TaskbarApplet::widthForHeight(int h) const diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp index 94d8a92db..6e1f11504 100644 --- a/kicker/applets/trash/trashapplet.cpp +++ b/kicker/applets/trash/trashapplet.cpp @@ -33,7 +33,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("trashapplet"); + TDEGlobal::locale()->insertCatalogue("trashapplet"); return new TrashApplet(configFile, KPanelApplet::Normal, KPanelApplet::About, parent, "trashapplet"); } @@ -70,7 +70,7 @@ TrashApplet::~TrashApplet() disconnect( mpDirLister, TQT_SIGNAL( clear() ), this, TQT_SLOT( slotClear() ) ); delete mpDirLister; - KGlobal::locale()->removeCatalogue("trashapplet"); + TDEGlobal::locale()->removeCatalogue("trashapplet"); } void TrashApplet::about() diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index 63944e710..71160cbe6 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/kicker/extensions/dockbar/dockbarextension.cpp @@ -46,7 +46,7 @@ extern "C" { KDE_EXPORT KPanelExtension* init(TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("dockbarextension"); + TDEGlobal::locale()->insertCatalogue("dockbarextension"); return new DockBarExtension(configFile, KPanelExtension::Normal, 0, parent, "dockbarextension"); } @@ -316,9 +316,9 @@ void DockBarExtension::loadContainerConfig() DockContainer* c = new DockContainer(cmd, this, resName, resClass ); addContainer(c); - KProcess proc; + TDEProcess proc; proc << KShell::splitArgs( cmd ); - if (!proc.start(KProcess::DontCare)) { + if (!proc.start(TDEProcess::DontCare)) { fail_list.append(cmd); removeContainer(c); } diff --git a/kicker/extensions/kasbar/ChangeLog b/kicker/extensions/kasbar/ChangeLog index 8cbb33868..c8ee55166 100644 --- a/kicker/extensions/kasbar/ChangeLog +++ b/kicker/extensions/kasbar/ChangeLog @@ -594,7 +594,7 @@ 2002-08-30 Friday 10:37 pfeiffer - * use KGlobal::taskbarFont(), patch by CCMAIL: Luciano Montanaro + * use TDEGlobal::taskbarFont(), patch by CCMAIL: Luciano Montanaro 2002-08-29 Thursday 17:38 mueller @@ -656,7 +656,7 @@ * grrr, I fixed that before 2.2.2 and it's back :( - + KGlobal::locale()->insertCatalogue("kasbarextension"); + + TDEGlobal::locale()->insertCatalogue("kasbarextension"); 2002-02-26 Tuesday 17:04 elter diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp index 35028d9e0..4d51d92ef 100644 --- a/kicker/extensions/kasbar/kasaboutdlg.cpp +++ b/kicker/extensions/kasbar/kasaboutdlg.cpp @@ -80,8 +80,8 @@ #include "kasaboutdlg.h" #include "version.h" -#define Icon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium ) -#define LargeIcon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge ) +#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium ) +#define LargeIcon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge ) KasAboutDialog::KasAboutDialog( TQWidget *parent ) : KDialogBase( KDialogBase::IconList, i18n("About Kasbar"), diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp index 89fcad751..430d98c84 100644 --- a/kicker/extensions/kasbar/kasbar.cpp +++ b/kicker/extensions/kasbar/kasbar.cpp @@ -717,7 +717,7 @@ void KasBar::addTestItems() KasItem *i = new KasItem( this ); insert( 0, i ); i->setText( "Animated" ); - i->setIcon( KGlobal::iconLoader()->loadIcon( "icons", KIcon::NoGroup, KIcon::SizeMedium ) ); + i->setIcon( TDEGlobal::iconLoader()->loadIcon( "icons", KIcon::NoGroup, KIcon::SizeMedium ) ); i->setAnimation( resources()->startupAnimation() ); TQTimer *aniTimer = new TQTimer( i, "aniTimer" ); connect( aniTimer, TQT_SIGNAL( timeout() ), i, TQT_SLOT( advanceAnimation() ) ); diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp index 169fe5b52..708aeb1e6 100644 --- a/kicker/extensions/kasbar/kasbarapp.cpp +++ b/kicker/extensions/kasbar/kasbarapp.cpp @@ -77,7 +77,7 @@ int main( int argc, char **argv ) { TDECmdLineArgs::init( argc, argv, "kasbar", "KasBar", I18N_NOOP( "An alternative task manager" ), VERSION_STRING ); TDECmdLineArgs::addCmdLineOptions( options ); - KGlobal::locale()->setMainCatalogue( "kasbarextension" ); + TDEGlobal::locale()->setMainCatalogue( "kasbarextension" ); TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp index 3a3a023fb..6e011cc71 100644 --- a/kicker/extensions/kasbar/kasbarextension.cpp +++ b/kicker/extensions/kasbar/kasbarextension.cpp @@ -76,7 +76,7 @@ extern "C" { KDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile ) { - KGlobal::locale()->insertCatalogue("kasbarextension"); + TDEGlobal::locale()->insertCatalogue("kasbarextension"); return new KasBarExtension( configFile, KPanelExtension::Normal, KPanelExtension::About | KPanelExtension::Preferences, @@ -109,7 +109,7 @@ KasBarExtension::~KasBarExtension() { if ( detached_ && (!kasbar.isNull()) ) kasbar->deleteLater(); - KGlobal::locale()->removeCatalogue("kasbarextension"); + TDEGlobal::locale()->removeCatalogue("kasbarextension"); } void KasBarExtension::setDetached( bool detach ) diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp index 51dac687d..6545f57eb 100644 --- a/kicker/extensions/kasbar/kasclockitem.cpp +++ b/kicker/extensions/kasbar/kasclockitem.cpp @@ -75,8 +75,8 @@ KasPopup *KasClockItem::createPopup() void KasClockItem::updateTime() { - setText( KGlobal::locale()->formatDate( TQDate::currentDate(), true /* shortFormat */ ) ); - lcd->display( KGlobal::locale()->formatTime( TQTime::currentTime(), false /* includeSecs */, false /* isDuration */) ); + setText( TDEGlobal::locale()->formatDate( TQDate::currentDate(), true /* shortFormat */ ) ); + lcd->display( TDEGlobal::locale()->formatTime( TQTime::currentTime(), false /* includeSecs */, false /* isDuration */) ); update(); } diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp index 7e23ce7fd..638213e8e 100644 --- a/kicker/extensions/kasbar/kasgroupitem.cpp +++ b/kicker/extensions/kasbar/kasgroupitem.cpp @@ -144,7 +144,7 @@ void KasGroupItem::updateIcon() bool usedIconLoader = false; Task::Ptr t = items.first(); if (!t) - p = KGlobal::iconLoader()->loadIcon( "kicker", + p = TDEGlobal::iconLoader()->loadIcon( "kicker", KIcon::NoGroup, KIcon::SizeSmall ); @@ -157,7 +157,7 @@ void KasGroupItem::updateIcon() p = t->bestIcon( sizes[kasbar()->itemSize()], usedIconLoader ); if ( p.isNull() ) - p = KGlobal::iconLoader()->loadIcon( "error", KIcon::NoGroup, KIcon::SizeSmall ); + p = TDEGlobal::iconLoader()->loadIcon( "error", KIcon::NoGroup, KIcon::SizeSmall ); setIcon( p ); } diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp index 323148713..866f6eb57 100644 --- a/kicker/extensions/kasbar/kasitem.cpp +++ b/kicker/extensions/kasbar/kasitem.cpp @@ -341,7 +341,7 @@ void KasItem::paintLabel( TQPainter *p ) } } - p->setFont( KGlobalSettings::taskbarFont() ); + p->setFont( TDEGlobalSettings::taskbarFont() ); p->setPen( resources()->labelPenColor() ); if ( fontMetrics().width( text ) > extent()-4 ) @@ -405,7 +405,7 @@ void KasItem::paintArrowLabel( TQPainter *p, int arrowSize, bool arrowOnLeft ) w -= arrowSize; } - p->setFont( KGlobalSettings::taskbarFont() ); + p->setFont( TDEGlobalSettings::taskbarFont() ); p->setPen( resources()->labelPenColor() ); if ( fontMetrics().width( text ) > w ) p->drawText( lx, ly, w, h-1, AlignLeft | AlignVCenter, text ); diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp index 6dd39517f..42199272a 100644 --- a/kicker/extensions/kasbar/kasprefsdlg.cpp +++ b/kicker/extensions/kasbar/kasprefsdlg.cpp @@ -75,8 +75,8 @@ #include "kasprefsdlg.h" #include "kasprefsdlg.moc" -#define Icon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium ) -#define LargeIcon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge ) +#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium ) +#define LargeIcon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge ) KasPrefsDialog::KasPrefsDialog( KasTasker *kas, TQWidget *parent ) diff --git a/kicker/extensions/kasbar/kasstartupitem.cpp b/kicker/extensions/kasbar/kasstartupitem.cpp index 41adc5249..6011612e3 100644 --- a/kicker/extensions/kasbar/kasstartupitem.cpp +++ b/kicker/extensions/kasbar/kasstartupitem.cpp @@ -98,33 +98,33 @@ TQPixmap KasStartupItem::icon() const switch( kasbar()->itemSize() ) { case KasBar::Small: /* ***** NOP ****** - pixmap = KGlobal::iconLoader()->loadIcon( startup_->icon(), + pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(), KIcon::NoGroup, KIcon::SizeSmall ); */ break; case KasBar::Medium: - pixmap = KGlobal::iconLoader()->loadIcon( startup_->icon(), + pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(), KIcon::NoGroup, KIcon::SizeMedium ); break; case KasBar::Large: - pixmap = KGlobal::iconLoader()->loadIcon( startup_->icon(), + pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(), KIcon::NoGroup, KIcon::SizeLarge ); break; case KasBar::Huge: - pixmap = KGlobal::iconLoader()->loadIcon( startup_->icon(), + pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(), KIcon::NoGroup, KIcon::SizeHuge ); break; case KasBar::Enormous: - pixmap = KGlobal::iconLoader()->loadIcon( startup_->icon(), + pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(), KIcon::NoGroup, KIcon::SizeEnormous ); break; default: - pixmap = KGlobal::iconLoader()->loadIcon( "error", + pixmap = TDEGlobal::iconLoader()->loadIcon( "error", KIcon::NoGroup, KIcon::SizeSmall ); } diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp index 8b6714cad..ae775171f 100644 --- a/kicker/extensions/kasbar/kastaskitem.cpp +++ b/kicker/extensions/kasbar/kastaskitem.cpp @@ -85,7 +85,7 @@ #include "kastaskitem.h" #include "kasbarextension.h" -#define Icon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium ) +#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium ) static const int CHECK_ATTENTION_DELAY = 2000; @@ -350,11 +350,11 @@ void KasTaskItem::sendToTray() TQString s; s.setNum( task_->window() ); - KProcess proc; + TDEProcess proc; proc << "ksystraycmd"; proc << "--wid" << s << "--hidden"; - bool ok = proc.start( KProcess::DontCare ); + bool ok = proc.start( TDEProcess::DontCare ); if ( !ok ) { kdWarning(1345) << "Unable to launch ksystraycmd" << endl; KPassivePopup::message( i18n("Could Not Send to Tray"), diff --git a/kicker/extensions/kasbar/kastaskpopup.cpp b/kicker/extensions/kasbar/kastaskpopup.cpp index 25c096a65..6529fafec 100644 --- a/kicker/extensions/kasbar/kastaskpopup.cpp +++ b/kicker/extensions/kasbar/kastaskpopup.cpp @@ -73,7 +73,7 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name ) { this->item = item; - setFont(KGlobalSettings::generalFont()); + setFont(TDEGlobalSettings::generalFont()); setMouseTracking( true ); TQString text = item->task()->visibleIconicName(); diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp index 6ae140a23..fe5acd1bb 100644 --- a/kicker/extensions/sidebar/sidebarextension.cpp +++ b/kicker/extensions/sidebar/sidebarextension.cpp @@ -33,8 +33,8 @@ extern "C" { KDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile ) { - KGlobal::locale()->insertCatalogue("kickersidebarextension"); - KGlobal::locale()->insertCatalogue("konqueror"); + TDEGlobal::locale()->insertCatalogue("kickersidebarextension"); + TDEGlobal::locale()->insertCatalogue("konqueror"); return new SidebarExtension( configFile, KPanelExtension::Normal, 0, @@ -106,8 +106,8 @@ void SidebarExtension::openURLRequest( const KURL &url, const KParts::URLArgs &) SidebarExtension::~SidebarExtension() { - KGlobal::locale()->removeCatalogue("kickersidebarextension"); - KGlobal::locale()->removeCatalogue("konqueror"); + TDEGlobal::locale()->removeCatalogue("kickersidebarextension"); + TDEGlobal::locale()->removeCatalogue("konqueror"); } bool SidebarExtension::eventFilter( TQObject *, TQEvent *e ) { diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp index 047dc2beb..2b2d65217 100644 --- a/kicker/extensions/taskbar/taskbarextension.cpp +++ b/kicker/extensions/taskbar/taskbarextension.cpp @@ -44,7 +44,7 @@ extern "C" { KDE_EXPORT KPanelExtension* init( TQWidget *parent, const TQString& configFile ) { - KGlobal::locale()->insertCatalogue( "taskbarextension" ); + TDEGlobal::locale()->insertCatalogue( "taskbarextension" ); return new TaskBarExtension( configFile, KPanelExtension::Stretch, KPanelExtension::Preferences, parent, "taskbarextension" ); } @@ -78,7 +78,7 @@ TaskBarExtension::TaskBarExtension(const TQString& configFile, Type type, TaskBarExtension::~TaskBarExtension() { - KGlobal::locale()->removeCatalogue( "taskbarextension" ); + TDEGlobal::locale()->removeCatalogue( "taskbarextension" ); } void TaskBarExtension::positionChange( Position p ) diff --git a/kicker/kicker/buttons/desktopbutton.cpp b/kicker/kicker/buttons/desktopbutton.cpp index 9f23741e5..c35a8bf47 100644 --- a/kicker/kicker/buttons/desktopbutton.cpp +++ b/kicker/kicker/buttons/desktopbutton.cpp @@ -76,7 +76,7 @@ void DesktopButton::dragEnterEvent( TQDragEnterEvent *ev ) void DesktopButton::dropEvent( TQDropEvent *ev ) { - KURL dPath ( KGlobalSettings::desktopPath() ); + KURL dPath ( TDEGlobalSettings::desktopPath() ); KFileItem item( dPath, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); KonqOperations::doDrop( &item, dPath, ev, this ); PanelButton::dropEvent(ev); diff --git a/kicker/kicker/buttons/nonkdeappbutton.cpp b/kicker/kicker/buttons/nonkdeappbutton.cpp index c953d075d..808d02633 100644 --- a/kicker/kicker/buttons/nonkdeappbutton.cpp +++ b/kicker/kicker/buttons/nonkdeappbutton.cpp @@ -182,12 +182,12 @@ void NonKDEAppButton::dropEvent(TQDropEvent *ev) deskFile.setDesktopGroup(); // ... and add it to the exec string - execStr += KProcess::quote(deskFile.readURL()) + " "; + execStr += TDEProcess::quote(deskFile.readURL()) + " "; } else { // it's just a URL of some sort, add it directly to the exec - execStr += KProcess::quote(url.path()) + " "; + execStr += TDEProcess::quote(url.path()) + " "; } } @@ -223,7 +223,7 @@ void NonKDEAppButton::runCommand(const TQString& execStr) // run in a terminal? ok! we find this in the config file in the // [misc] group (this will usually be in kdeglobal, actually, which // get merged into the application config automagically for us - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("misc"); TQString termStr = config->readPathEntry("Terminal", "konsole"); diff --git a/kicker/kicker/buttons/servicebutton.cpp b/kicker/kicker/buttons/servicebutton.cpp index f7322a976..57a619954 100644 --- a/kicker/kicker/buttons/servicebutton.cpp +++ b/kicker/kicker/buttons/servicebutton.cpp @@ -54,7 +54,7 @@ ServiceButton::ServiceButton(const KService::Ptr &service, TQWidget* parent) { if (_id.startsWith("/")) { - TQString tmp = KGlobal::dirs()->relativeLocation("appdata", _id); + TQString tmp = TDEGlobal::dirs()->relativeLocation("appdata", _id); if (!tmp.startsWith("/")) _id = ":"+tmp; } @@ -112,7 +112,7 @@ void ServiceButton::loadServiceFromId(const TQString &id) if (_id.startsWith("/")) { - TQString tmp = KGlobal::dirs()->relativeLocation("appdata", _id); + TQString tmp = TDEGlobal::dirs()->relativeLocation("appdata", _id); if (!tmp.startsWith("/")) _id = ":"+tmp; } diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp index c42387173..e224efe7a 100644 --- a/kicker/kicker/core/container_base.cpp +++ b/kicker/kicker/core/container_base.cpp @@ -105,7 +105,7 @@ void BaseContainer::slotRemoved(KConfig* config) { if (!config) { - config = KGlobal::config(); + config = TDEGlobal::config(); } config->deleteGroup(appletId().latin1()); diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 9af99e3ab..37cd1516a 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -172,7 +172,7 @@ void ExtensionContainer::init() updateHighlightColor(); // if we were hidden when kicker quit, let's start out hidden as well! - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup(extensionId()); int tmp = config->readNumEntry("UserHidden", Unhidden); if (tmp > Unhidden && tmp <= RightBottom) @@ -359,7 +359,7 @@ void ExtensionContainer::readConfig() void ExtensionContainer::writeConfig() { // kdDebug(1210) << "ExtensionContainer::writeConfig()" << endl; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup(extensionId()); config->writePathEntry("ConfigFile", _info.configFile()); @@ -387,7 +387,7 @@ void ExtensionContainer::showPanelMenu( const TQPoint& globalPos ) if (!_opMnu) { - KDesktopFile f(KGlobal::dirs()->findResource("extensions", _info.desktopFile())); + KDesktopFile f(TDEGlobal::dirs()->findResource("extensions", _info.desktopFile())); _opMnu = new PanelExtensionOpMenu(f.readName(), m_extension ? m_extension->actions() : 0, this); @@ -984,7 +984,7 @@ void ExtensionContainer::animatedHide(bool left) // save our hidden status so that when kicker starts up again // we'll come back in the same state - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup(extensionId()); config->writeEntry("UserHidden", userHidden()); @@ -1385,7 +1385,7 @@ void ExtensionContainer::positionChange(KPanelExtension::Position p) void ExtensionContainer::updateHighlightColor() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("WM"); TQColor color = TQApplication::palette().active().highlight(); m_highlightColor = config->readColorEntry("activeBackground", &color); diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp index 4d6f29920..fce133a0f 100644 --- a/kicker/kicker/core/extensionmanager.cpp +++ b/kicker/kicker/core/extensionmanager.cpp @@ -87,7 +87,7 @@ ExtensionManager::~ExtensionManager() void ExtensionManager::initialize() { // kdDebug(1210) << "ExtensionManager::loadContainerConfig()" << endl; - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); PluginManager* pm = PluginManager::the(); // set up the "main" panel @@ -179,7 +179,7 @@ void ExtensionManager::configureMenubar(bool duringInit) if( KConfigGroup( &menuConfig, "KDE" ).readBoolEntry("macStyle", false) || KConfigGroup( &menuConfig, "Menubar" ).readBoolEntry( "ShowMenubar", false )) { - if (KGlobal::dirs()->findResource("applets", "menuapplet.desktop").isEmpty() || + if (TDEGlobal::dirs()->findResource("applets", "menuapplet.desktop").isEmpty() || m_menubarPanel) { return; @@ -239,7 +239,7 @@ void ExtensionManager::migrateMenubar() // panel, meaning kickerrc itself would have to be vastly modified // with lots of complications. not work it IMHO. - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("General"); if (config->readBoolEntry("CheckedForMenubar", false)) @@ -322,7 +322,7 @@ void ExtensionManager::saveContainerConfig() { // kdDebug(1210) << "ExtensionManager::saveContainerConfig()" << endl; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); // build the extension list TQStringList elist; diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp index e965d3761..864bcec6f 100644 --- a/kicker/kicker/core/kicker.cpp +++ b/kicker/kicker/core/kicker.cpp @@ -96,26 +96,26 @@ Kicker::Kicker() dcopClient()->setDefaultObject("Panel"); disableSessionManagement(); TQString dataPathBase = KStandardDirs::kde_default("data").append("kicker/"); - KGlobal::dirs()->addResourceType("mini", dataPathBase + "pics/mini"); - KGlobal::dirs()->addResourceType("icon", dataPathBase + "pics"); - KGlobal::dirs()->addResourceType("builtinbuttons", dataPathBase + "builtins"); - KGlobal::dirs()->addResourceType("specialbuttons", dataPathBase + "menuext"); - KGlobal::dirs()->addResourceType("applets", dataPathBase + "applets"); - KGlobal::dirs()->addResourceType("tiles", dataPathBase + "tiles"); - KGlobal::dirs()->addResourceType("extensions", dataPathBase + "extensions"); + TDEGlobal::dirs()->addResourceType("mini", dataPathBase + "pics/mini"); + TDEGlobal::dirs()->addResourceType("icon", dataPathBase + "pics"); + TDEGlobal::dirs()->addResourceType("builtinbuttons", dataPathBase + "builtins"); + TDEGlobal::dirs()->addResourceType("specialbuttons", dataPathBase + "menuext"); + TDEGlobal::dirs()->addResourceType("applets", dataPathBase + "applets"); + TDEGlobal::dirs()->addResourceType("tiles", dataPathBase + "tiles"); + TDEGlobal::dirs()->addResourceType("extensions", dataPathBase + "extensions"); KImageIO::registerFormats(); - KGlobal::iconLoader()->addExtraDesktopThemes(); + TDEGlobal::iconLoader()->addExtraDesktopThemes(); - KGlobal::locale()->insertCatalogue("tdmgreet"); - KGlobal::locale()->insertCatalogue("libkonq"); - KGlobal::locale()->insertCatalogue("libdmctl"); - KGlobal::locale()->insertCatalogue("libtaskbar"); + TDEGlobal::locale()->insertCatalogue("tdmgreet"); + TDEGlobal::locale()->insertCatalogue("libkonq"); + TDEGlobal::locale()->insertCatalogue("libdmctl"); + TDEGlobal::locale()->insertCatalogue("libtaskbar"); // initialize our keys // note that this creates the KMenu by calling MenuManager::the() - keys = new KGlobalAccel( TQT_TQOBJECT(this) ); + keys = new TDEGlobalAccel( TQT_TQOBJECT(this) ); #define KICKER_ALL_BINDINGS #include "kickerbindings.cpp" keys->readSettings(); @@ -197,7 +197,7 @@ void Kicker::slotSettingsChanged(int category) void Kicker::paletteChanged() { - KConfigGroup c(KGlobal::config(), "General"); + KConfigGroup c(TDEGlobal::config(), "General"); KickerSettings::setTintColor(c.readColorEntry("TintColor", &palette().active().mid())); KickerSettings::self()->writeConfig(); @@ -227,7 +227,7 @@ void Kicker::configure() { static bool notFirstConfig = false; - KConfig* c = KGlobal::config(); + KConfig* c = TDEGlobal::config(); c->reparseConfiguration(); c->setGroup("General"); m_canAddContainers = !c->entryIsImmutable("Applets2"); diff --git a/kicker/kicker/core/kicker.h b/kicker/kicker/core/kicker.h index 0416bc5ce..81fa8123f 100644 --- a/kicker/kicker/core/kicker.h +++ b/kicker/kicker/core/kicker.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class KCMultiDialog; class KDirWatch; -class KGlobalAccel; +class TDEGlobalAccel; class KWinModule; class PanelKMenu; class PanelPopupButton; @@ -122,7 +122,7 @@ private slots: private: static void crashHandler(int signal); - KGlobalAccel* keys; + TDEGlobalAccel* keys; KWinModule* m_twinModule; KCMultiDialog* m_configDialog; bool m_canAddContainers; diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp index 1085bd430..893efdd41 100644 --- a/kicker/kicker/core/main.cpp +++ b/kicker/kicker/core/main.cpp @@ -99,7 +99,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) } } - KGlobal::locale()->setMainCatalogue("kicker"); + TDEGlobal::locale()->setMainCatalogue("kicker"); TQCString appname; if (kicker_screen_number == 0) diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp index 73fa0c2b0..6b41f1c50 100644 --- a/kicker/kicker/core/panelextension.cpp +++ b/kicker/kicker/core/panelextension.cpp @@ -388,7 +388,7 @@ void PanelExtension::slotBuildOpMenu() if (kapp->authorize("action/help")) { - KHelpMenu* help = new KHelpMenu( this, KGlobal::instance()->aboutData(), false); + KHelpMenu* help = new KHelpMenu( this, TDEGlobal::instance()->aboutData(), false); _opMnu->insertItem(SmallIconSet("help"), KStdGuiItem::help().text(), help->menu()); } _opMnu->adjustSize(); diff --git a/kicker/kicker/core/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp index d1706ada9..0ac38610f 100644 --- a/kicker/kicker/core/pluginmanager.cpp +++ b/kicker/kicker/core/pluginmanager.cpp @@ -55,28 +55,28 @@ PluginManager* PluginManager::the() AppletInfo::List PluginManager::applets(bool sort, AppletInfo::List* list) { TQStringList rel; - KGlobal::dirs()->findAllResources("applets", "*.desktop", false, true, rel); + TDEGlobal::dirs()->findAllResources("applets", "*.desktop", false, true, rel); return plugins(rel, AppletInfo::Applet, sort, list); } AppletInfo::List PluginManager::extensions(bool sort, AppletInfo::List* list) { TQStringList rel; - KGlobal::dirs()->findAllResources("extensions", "*.desktop", false, true, rel); + TDEGlobal::dirs()->findAllResources("extensions", "*.desktop", false, true, rel); return plugins(rel, AppletInfo::Extension, sort, list); } AppletInfo::List PluginManager::builtinButtons(bool sort, AppletInfo::List* list) { TQStringList rel; - KGlobal::dirs()->findAllResources("builtinbuttons", "*.desktop", false, true, rel); + TDEGlobal::dirs()->findAllResources("builtinbuttons", "*.desktop", false, true, rel); return plugins(rel, AppletInfo::BuiltinButton, sort, list); } AppletInfo::List PluginManager::specialButtons(bool sort, AppletInfo::List* list) { TQStringList rel; - KGlobal::dirs()->findAllResources("specialbuttons", "*.desktop", false, true, rel); + TDEGlobal::dirs()->findAllResources("specialbuttons", "*.desktop", false, true, rel); return plugins(rel, AppletInfo::SpecialButton, sort, list); } @@ -113,7 +113,7 @@ AppletInfo::List PluginManager::plugins(const TQStringList& desktopFiles, PluginManager::PluginManager() { - KConfigGroup generalGroup(KGlobal::config(), "General"); + KConfigGroup generalGroup(TDEGlobal::config(), "General"); m_untrustedApplets = generalGroup.readListEntry("UntrustedApplets"); m_untrustedExtensions = generalGroup.readListEntry("UntrustedExtensions"); } @@ -250,13 +250,13 @@ AppletContainer* PluginManager::createAppletContainer( TQWidget* parent, bool isImmutable) { - TQString desktopPath = KGlobal::dirs()->findResource( "applets", desktopFile ); + TQString desktopPath = TDEGlobal::dirs()->findResource( "applets", desktopFile ); // KDE4: remove // support the old (KDE 2.2) nameing scheme if (desktopPath.isEmpty()) { - desktopPath = KGlobal::dirs()->findResource( "applets", + desktopPath = TDEGlobal::dirs()->findResource( "applets", desktopFile.right( desktopFile.length() - 1 ) ); } @@ -282,7 +282,7 @@ AppletContainer* PluginManager::createAppletContainer( { // we haven't loaded this puppy before and we're not in the untrusted list m_untrustedApplets.append(desktopFile); - KConfigGroup generalGroup(KGlobal::config(), "General"); + KConfigGroup generalGroup(TDEGlobal::config(), "General"); generalGroup.writeEntry("UntrustedApplets", m_untrustedApplets); generalGroup.sync(); } @@ -308,7 +308,7 @@ ExtensionContainer* PluginManager::createExtensionContainer(const TQString& desk return 0; } - TQString desktopPath = KGlobal::dirs()->findResource("extensions", desktopFile); + TQString desktopPath = TDEGlobal::dirs()->findResource("extensions", desktopFile); if (desktopPath.isEmpty()) { return 0; @@ -335,7 +335,7 @@ ExtensionContainer* PluginManager::createExtensionContainer(const TQString& desk { // we don't have an instance around and we're not in the untrusted list! m_untrustedExtensions.append(desktopFile); - KConfigGroup generalGroup(KGlobal::config(), "General"); + KConfigGroup generalGroup(TDEGlobal::config(), "General"); generalGroup.writeEntry("UntrustedExtensions", m_untrustedExtensions); generalGroup.sync(); } @@ -349,7 +349,7 @@ void PluginManager::clearUntrustedLists() m_untrustedExtensions.clear(); m_untrustedApplets.clear(); - KConfigGroup generalGroup(KGlobal::config(), "General"); + KConfigGroup generalGroup(TDEGlobal::config(), "General"); generalGroup.writeEntry("UntrustedApplets", m_untrustedApplets); generalGroup.writeEntry("UntrustedExtensions", m_untrustedExtensions); generalGroup.sync(); diff --git a/kicker/kicker/kicker-3.4-reverseLayout.cpp b/kicker/kicker/kicker-3.4-reverseLayout.cpp index d3fd5f755..a588c6258 100644 --- a/kicker/kicker/kicker-3.4-reverseLayout.cpp +++ b/kicker/kicker/kicker-3.4-reverseLayout.cpp @@ -143,9 +143,9 @@ int main(int argc, char** argv) tempFile.close(); // Run kconf_update on the childpanel config files. - KProcess kconf_update; + TDEProcess kconf_update; kconf_update << "kconf_update" << tempFile.name(); - kconf_update.start(KProcess::Block); + kconf_update.start(TDEProcess::Block); tempFile.unlink(); } diff --git a/kicker/kicker/plugins/kickoff-beagle-plugin.cpp b/kicker/kicker/plugins/kickoff-beagle-plugin.cpp index 223074a8d..a3b3f8126 100644 --- a/kicker/kicker/plugins/kickoff-beagle-plugin.cpp +++ b/kicker/kicker/plugins/kickoff-beagle-plugin.cpp @@ -407,7 +407,7 @@ HitMenuItem *KickoffBeaglePlugin::hitToHitMenuItem (int category, Hit *hit) title = i18n("Conversation With %1").arg(title.isEmpty() ? i18n("Unknown Person") : title); TQDateTime datetime; datetime = datetimeFromString((*hit) [fixme_starttime]); - info=i18n("Date: %1").arg(KGlobal::locale()->formatDateTime(datetime,false)); + info=i18n("Date: %1").arg(TDEGlobal::locale()->formatDateTime(datetime,false)); if (hit->getMimeType()=="beagle/x-kopete-log") icon="kopete"; else diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp index d6b144803..75e4df12f 100644 --- a/kicker/kicker/ui/addapplet.cpp +++ b/kicker/kicker/ui/addapplet.cpp @@ -74,7 +74,7 @@ AppletWidget::AppletWidget(const AppletInfo& info, bool odd, TQWidget *parent) itemDescription->installEventFilter(this); - KIconLoader * ldr = KGlobal::iconLoader(); + KIconLoader * ldr = TDEGlobal::iconLoader(); TQPixmap icon = ldr->loadIcon(info.icon(), KIcon::Panel, KIcon::SizeLarge); itemPixmap->setPixmap(icon); itemPixmap->installEventFilter(this); @@ -99,7 +99,7 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e) { TQMouseEvent* me = TQT_TQMOUSEEVENT(e); if ((me->pos() - m_dragStart).manhattanLength() > - KGlobalSettings::dndEventDelay()) + TDEGlobalSettings::dndEventDelay()) { AppletInfoDrag* drag = new AppletInfoDrag(m_appletInfo, this); @@ -165,7 +165,7 @@ void AppletWidget::mouseMoveEvent(TQMouseEvent *e) if (e->button() == Qt::LeftButton && !m_dragStart.isNull() && (e->pos() - m_dragStart).manhattanLength() > - KGlobalSettings::dndEventDelay()) + TDEGlobalSettings::dndEventDelay()) { AppletInfoDrag* drag = new AppletInfoDrag(m_appletInfo, this); @@ -202,18 +202,18 @@ void AppletWidget::setSelected(bool selected) // for now just used to switch colours around =) if (m_selected) { - setPaletteBackgroundColor(KGlobalSettings::highlightColor()); - setPaletteForegroundColor(KGlobalSettings::highlightedTextColor()); + setPaletteBackgroundColor(TDEGlobalSettings::highlightColor()); + setPaletteForegroundColor(TDEGlobalSettings::highlightedTextColor()); } else if (m_odd) { - setPaletteBackgroundColor(KGlobalSettings::baseColor()); - setPaletteForegroundColor(KGlobalSettings::textColor()); + setPaletteBackgroundColor(TDEGlobalSettings::baseColor()); + setPaletteForegroundColor(TDEGlobalSettings::textColor()); } else { - setPaletteBackgroundColor(KGlobalSettings::alternateBackgroundColor()); - setPaletteForegroundColor(KGlobalSettings::textColor()); + setPaletteBackgroundColor(TDEGlobalSettings::alternateBackgroundColor()); + setPaletteForegroundColor(TDEGlobalSettings::textColor()); } } @@ -241,7 +241,7 @@ AddAppletDialog::AddAppletDialog(ContainerArea* cArea, m_mainWidget = new AppletView(this, "AddAppletDialog::m_mainWidget"); m_mainWidget->appletScrollView->setResizePolicy(TQScrollView::Manual); m_mainWidget->appletScrollView->setHScrollBarMode(TQScrollView::AlwaysOff); - m_mainWidget->appletScrollView->viewport()->setPaletteBackgroundColor(KGlobalSettings::baseColor()); + m_mainWidget->appletScrollView->viewport()->setPaletteBackgroundColor(TDEGlobalSettings::baseColor()); setMainWidget(m_mainWidget); @@ -311,7 +311,7 @@ bool AddAppletDialog::eventFilter(TQObject *o, TQEvent *e) void AddAppletDialog::populateApplets() { m_appletBox = new TQWidget(m_mainWidget->appletScrollView->viewport()); - m_appletBox->setPaletteBackgroundColor(KGlobalSettings::baseColor()); + m_appletBox->setPaletteBackgroundColor(TDEGlobalSettings::baseColor()); m_mainWidget->appletScrollView->addChild(m_appletBox, 0, 0); m_appletBox->show(); TQVBoxLayout* layout = new TQVBoxLayout(m_appletBox); diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp index 4998fc5cf..696065266 100644 --- a/kicker/kicker/ui/browser_mnu.cpp +++ b/kicker/kicker/ui/browser_mnu.cpp @@ -149,7 +149,7 @@ void PanelBrowserMenu::initialize() // only the first part menu got them if(_startid == 0 && !_filesOnly) { insertTitle(path()); - KConfig *c = KGlobal::config(); + KConfig *c = TDEGlobal::config(); c->setGroup("menus"); insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQT_SLOT(slotOpenFileManager())); if (kapp->authorize("shell_access") && c->readBoolEntry("kickerOpenInTerminalIsVisible",false)) @@ -196,7 +196,7 @@ void PanelBrowserMenu::initialize() if ( iconPath.startsWith("./") ) iconPath = path + '/' + iconPath.mid(2); - icon = KGlobal::iconLoader()->loadIcon(iconPath, + icon = TDEGlobal::iconLoader()->loadIcon(iconPath, KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState, 0, true); if(icon.isNull()) @@ -245,7 +245,7 @@ void PanelBrowserMenu::initialize() TQString s = c.readEntry("Icon"); if(!_icons->contains(s)) { - icon = KGlobal::iconLoader()->loadIcon(s, KIcon::Small, KIcon::SizeSmall, + icon = TDEGlobal::iconLoader()->loadIcon(s, KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState, 0, true); if(icon.isNull()) { @@ -309,7 +309,7 @@ void PanelBrowserMenu::initialize() // WABA: tear off handles don't work together with dynamically updated // menus. We can't update the menu while torn off, and we don't know // when it is torn off. - if(KGlobalSettings::insertTearOffHandle() && item_count > 0) + if(TDEGlobalSettings::insertTearOffHandle() && item_count > 0) insertTearOffHandle(); #endif @@ -453,13 +453,13 @@ void PanelBrowserMenu::slotOpenTerminal() config->setGroup("General"); TQString term = config->readPathEntry("TerminalApplication", "konsole"); - KProcess proc; + TDEProcess proc; proc << term; if (term == "konsole") proc << "--workdir" << path(); else proc.setWorkingDirectory(path()); - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } void PanelBrowserMenu::slotOpenFileManager() diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp index cd023eb8a..0054fbb60 100644 --- a/kicker/kicker/ui/hidebutton.cpp +++ b/kicker/kicker/ui/hidebutton.cpp @@ -153,7 +153,7 @@ void HideButton::slotSettingsChanged(int category) return; } - bool changeCursor = KGlobalSettings::changeCursorOverIcon(); + bool changeCursor = TDEGlobalSettings::changeCursorOverIcon(); if (changeCursor) { diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp index 913091bbf..431b62e6c 100644 --- a/kicker/kicker/ui/itemview.cpp +++ b/kicker/kicker/ui/itemview.cpp @@ -139,7 +139,7 @@ void KMenuItem::setDescription(const TQString& txt) void KMenuItem::setIcon(const TQString& icon, int size) { m_icon = icon; - TQListViewItem::setPixmap(0, KGlobal::iconLoader()->loadIcon(icon, KIcon::Panel, size )); + TQListViewItem::setPixmap(0, TDEGlobal::iconLoader()->loadIcon(icon, KIcon::Panel, size )); } void KMenuItem::setHasChildren( bool flag ) @@ -152,7 +152,7 @@ void KMenuItem::setup() { // if someone configured a larger generalFont than 10pt, he might have a _real_ problem with 7pt // the 7pt could be read out of konquerorrc I guess - float min_font_size = 7. * TQMAX(1., KGlobalSettings::generalFont().pointSizeFloat() / 10.); + float min_font_size = 7. * TQMAX(1., TDEGlobalSettings::generalFont().pointSizeFloat() / 10.); const int expected_height = 38; description_font_size = TQMAX( pointSize( expected_height * .3, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size ) ; @@ -1013,8 +1013,8 @@ TQDragObject * ItemView::dragObject() return 0; o = new KMultipleDrag(viewport()); - TQPixmap pix = KGlobal::iconLoader()->loadIcon( kitem->icon(), KIcon::Panel, m_iconSize); - TQPixmap add = KGlobal::iconLoader()->loadIcon( "add", KIcon::Small ); + TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( kitem->icon(), KIcon::Panel, m_iconSize); + TQPixmap add = TDEGlobal::iconLoader()->loadIcon( "add", KIcon::Small ); TQPainter p( &pix ); p.drawPixmap(pix.height()-add.height(), pix.width()-add.width(), add); diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index 48ef522fd..8dca46038 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -404,7 +404,7 @@ void PanelKMenu::initialize() // WABA: tear off handles don't work together with dynamically updated // menus. We can't update the menu while torn off, and we don't know // when it is torn off. - if (KGlobalSettings::insertTearOffHandle()) + if (TDEGlobalSettings::insertTearOffHandle()) insertTearOffHandle(); #endif diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index eb7fc8114..7dc8424d1 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -124,7 +124,7 @@ static TQString calculate(const TQString &exp) TQString result, cmd; const TQString bc = KStandardDirs::findExe("bc"); if ( !bc.isEmpty() ) - cmd = TQString("echo %1 | %2").arg(KProcess::quote(exp), KProcess::quote(bc)); + cmd = TQString("echo %1 | %2").arg(TDEProcess::quote(exp), TDEProcess::quote(bc)); else cmd = TQString("echo $((%1))").arg(exp); FILE *fs = popen(TQFile::encodeName(cmd).data(), "r"); @@ -160,7 +160,7 @@ int base_category_id[] = {ACTIONS_ID_BASE, APP_ID_BASE, BOOKMARKS_ID_BASE, NOTES static int used_size( TQLabel *label, int oldsize ) { - TQSimpleRichText st( label->text(), KGlobalSettings::toolBarFont() ); + TQSimpleRichText st( label->text(), TDEGlobalSettings::toolBarFont() ); st.setWidth( oldsize ); return QMAX( st.widthUsed(), oldsize ); } @@ -344,7 +344,7 @@ KMenu::KMenu() m_kcommand->setDuplicatesEnabled( false ); m_kcommand->setLineEdit(new KLineEdit(m_kcommand, "m_kcommand-lineedit")); - m_kcommand->setCompletionMode( KGlobalSettings::CompletionAuto ); + m_kcommand->setCompletionMode( TDEGlobalSettings::CompletionAuto ); connect(m_kcommand, TQT_SIGNAL(cleared()), TQT_SLOT(clearedHistory())); connect(m_kcommand->lineEdit(), TQT_SIGNAL(returnPressed()), TQT_SLOT(searchAccept())); connect(m_kcommand->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(searchChanged(const TQString &))); @@ -1353,9 +1353,9 @@ void KMenu::insertStaticItems() m_systemView->insertItem( "folder_home", i18n( "Home Folder" ), TQDir::homeDirPath(), "file://"+TQDir::homeDirPath(), nId++, index++ ); - if ( KStandardDirs::exists( KGlobalSettings::documentPath() + "/" ) ) + if ( KStandardDirs::exists( TDEGlobalSettings::documentPath() + "/" ) ) { - TQString documentPath = KGlobalSettings::documentPath(); + TQString documentPath = TDEGlobalSettings::documentPath(); if ( documentPath.endsWith( "/" ) ) documentPath = documentPath.left( documentPath.length() - 1 ); if (documentPath!=TQDir::homeDirPath()) @@ -2083,7 +2083,7 @@ void KMenu::searchProgramList(TQString relPath) int pos = exe.find(' '); if (pos>0) exe=exe.left(pos); - m_programsInMenu+=KGlobal::dirs()->findExe(exe); + m_programsInMenu+=TDEGlobal::dirs()->findExe(exe); } } } @@ -2282,7 +2282,7 @@ void KMenu::doQuery (bool return_pressed) "kcalc", TQString(), (++max_category_id [ACTIONS]), ACTIONS, "kcalc"); int index = getHitMenuItemPosition (hit_item); m_searchResultsWidget->insertItem(iconForHitMenuItem(hit_item), hit_item->display_name, - hit_item->display_info, KGlobal::dirs()->findExe("kcalc"), max_category_id [ACTIONS], index); + hit_item->display_info, TDEGlobal::dirs()->findExe("kcalc"), max_category_id [ACTIONS], index); } } @@ -2321,7 +2321,7 @@ void KMenu::doQuery (bool return_pressed) case KURIFilterData::SHELL: case KURIFilterData::EXECUTABLE: { - exe = KGlobal::dirs()->findExe(filterData.uri().url()); + exe = TDEGlobal::dirs()->findExe(filterData.uri().url()); #ifdef KDELIBS_SUSE bool gimp_hack = false; if (exe.endsWith("/bin/gimp")) { @@ -2688,13 +2688,13 @@ void KMenu::slotStartURL(const TQString& u) else { addToHistory(); if (u.startsWith("kaddressbook:/")) { - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "kaddressbook" << "--uid" << u.mid(14); proc->start(); accept(); return; } else if (u.startsWith("note:/")) { - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "tomboy"; *proc << "--open-note" << u; if (!proc->start()) @@ -2892,7 +2892,7 @@ void KMenu::slotContextMenu(int selected) KURL src,dest; KIO::CopyJob *job; - KProcess *proc; + TDEProcess *proc; TQStringList favs = KickerSettings::favorites(); @@ -2900,15 +2900,15 @@ void KMenu::slotContextMenu(int selected) case AddItemToDesktop: accept(); if (m_popupService) { - src.setPath( KGlobal::dirs()->findResource( "apps", m_popupService->desktopEntryPath() ) ); - dest.setPath( KGlobalSettings::desktopPath() ); + src.setPath( TDEGlobal::dirs()->findResource( "apps", m_popupService->desktopEntryPath() ) ); + dest.setPath( TDEGlobalSettings::desktopPath() ); dest.setFileName( src.fileName() ); job = KIO::copyAs( src, dest ); job->setDefaultPermissions( true ); } else { - KDesktopFile* df = new KDesktopFile( newDesktopFile(KURL(m_popupPath.path), KGlobalSettings::desktopPath() ) ); + KDesktopFile* df = new KDesktopFile( newDesktopFile(KURL(m_popupPath.path), TDEGlobalSettings::desktopPath() ) ); df->writeEntry("GenericName", m_popupPath.description); df->writeEntry( "Icon", m_popupPath.icon ); df->writePathEntry( "URL", m_popupPath.path ); @@ -2933,7 +2933,7 @@ void KMenu::slotContextMenu(int selected) case EditItem: case EditMenu: accept(); - proc = new KProcess(TQT_TQOBJECT(this)); + proc = new TDEProcess(TQT_TQOBJECT(this)); *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+m_popupPath.menuPath.section('/',-200,-2) << m_popupPath.menuPath.section('/', -1); proc->start(); @@ -2951,7 +2951,7 @@ void KMenu::slotContextMenu(int selected) case AddMenuToDesktop: { accept(); - KDesktopFile *df = new KDesktopFile( newDesktopFile(KURL("programs:/"+m_popupPath.menuPath),KGlobalSettings::desktopPath())); + KDesktopFile *df = new KDesktopFile( newDesktopFile(KURL("programs:/"+m_popupPath.menuPath),TDEGlobalSettings::desktopPath())); df->writeEntry( "Icon", m_popupPath.icon ); df->writePathEntry( "URL", "programs:/"+m_popupPath.menuPath ); df->writeEntry( "Name", m_popupPath.title ); diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index 8a483f086..64f779807 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/kicker/kicker/ui/service_mnu.cpp @@ -330,7 +330,7 @@ void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root, // menus. We can't update the menu while torn off, and we don't know // when it is torn off. if ( count() > 0 && !relPath_.isEmpty() ) - if (KGlobalSettings::insertTearOffHandle()) + if (TDEGlobalSettings::insertTearOffHandle()) insertTearOffHandle(); #endif } @@ -662,7 +662,7 @@ extern int kicker_screen_number; void PanelServiceMenu::slotContextMenu(int selected) { - KProcess *proc; + TDEProcess *proc; KService::Ptr service; KServiceGroup::Ptr g; TQByteArray ba; @@ -676,8 +676,8 @@ void PanelServiceMenu::slotContextMenu(int selected) case AddItemToDesktop: service = static_cast<KService *>(contextKSycocaEntry_); - src.setPath( KGlobal::dirs()->findResource( "apps", service->desktopEntryPath() ) ); - dest.setPath( KGlobalSettings::desktopPath() ); + src.setPath( TDEGlobal::dirs()->findResource( "apps", service->desktopEntryPath() ) ); + dest.setPath( TDEGlobalSettings::desktopPath() ); dest.setFileName( src.fileName() ); job = KIO::copyAs( src, dest ); @@ -694,7 +694,7 @@ void PanelServiceMenu::slotContextMenu(int selected) } case EditItem: - proc = new KProcess(TQT_TQOBJECT(this)); + proc = new TDEProcess(TQT_TQOBJECT(this)); *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+relPath_ << static_cast<KService *>(contextKSycocaEntry_)->menuId(); proc->start(); @@ -713,7 +713,7 @@ void PanelServiceMenu::slotContextMenu(int selected) case AddMenuToDesktop: g = static_cast<KServiceGroup *>(contextKSycocaEntry_); - dest.setPath( KGlobalSettings::desktopPath() ); + dest.setPath( TDEGlobalSettings::desktopPath() ); dest.setFileName( g->caption() ); df = new KDesktopFile( dest.path() ); @@ -738,7 +738,7 @@ void PanelServiceMenu::slotContextMenu(int selected) } case EditMenu: - proc = new KProcess(TQT_TQOBJECT(this)); + proc = new TDEProcess(TQT_TQOBJECT(this)); *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+static_cast<KServiceGroup *>(contextKSycocaEntry_)->relPath(); proc->start(); @@ -795,7 +795,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev) case KST_KServiceGroup: { - icon = KGlobal::iconLoader() + icon = TDEGlobal::iconLoader() ->loadIcon(static_cast<KServiceGroup *>(e)->icon(), KIcon::Small); url = "programs:/" + static_cast<KServiceGroup *>(e)->relPath(); break; diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp index d4735c2ba..0527f8224 100644 --- a/kicker/libkicker/global.cpp +++ b/kicker/libkicker/global.cpp @@ -326,7 +326,7 @@ TQPoint popupPosition(KPanelApplet::Direction d, void colorize(TQImage& image) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("WM"); TQColor color = TQApplication::palette().active().highlight(); TQColor activeTitle = config->readColorEntry("activeBackground", &color); @@ -414,20 +414,20 @@ TQIconSet menuIconSet(const TQString& icon) { if (iconSize > 0) { - iconset = KGlobal::iconLoader()->loadIconSet(icon, + iconset = TDEGlobal::iconLoader()->loadIconSet(icon, KIcon::NoGroup, iconSize, true); } else if (iconSize == 0) { - TQPixmap normal = KGlobal::iconLoader()->loadIcon(icon, + TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(icon, KIcon::Small, 0, KIcon::DefaultState, 0, true); - TQPixmap active = KGlobal::iconLoader()->loadIcon(icon, + TQPixmap active = TDEGlobal::iconLoader()->loadIcon(icon, KIcon::Small, 0, KIcon::ActiveState, diff --git a/kicker/libkicker/kickerSettings.kcfg b/kicker/libkicker/kickerSettings.kcfg index 9a4abc7fc..fcc14f71e 100644 --- a/kicker/libkicker/kickerSettings.kcfg +++ b/kicker/libkicker/kickerSettings.kcfg @@ -441,12 +441,12 @@ <entry name="ButtonFont" key="Font" type="Font" > <label>Font for the buttons with text.</label> - <default code="true">KGlobalSettings::generalFont()</default> + <default code="true">TDEGlobalSettings::generalFont()</default> </entry> <entry name="ButtonTextColor" key="TextColor" type="Color" > <label>Text color for the buttons.</label> - <default code="true">KGlobalSettings::textColor()</default> + <default code="true">TDEGlobalSettings::textColor()</default> </entry> </group> diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp index c862b09c5..3ecc19dfd 100644 --- a/kicker/libkicker/panelbutton.cpp +++ b/kicker/libkicker/panelbutton.cpp @@ -80,11 +80,11 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard { setBackgroundOrigin(AncestorOrigin); setWFlags(TQt::WNoAutoErase); - KGlobal::locale()->insertCatalogue("libkicker"); + TDEGlobal::locale()->insertCatalogue("libkicker"); calculateIconSize(); setAcceptDrops(true); - m_textColor = KGlobalSettings::textColor(); + m_textColor = TDEGlobalSettings::textColor(); updateSettings(TDEApplication::SETTINGS_MOUSE); @@ -108,7 +108,7 @@ void PanelButton::configure() return; } - KConfigGroup tilesGroup( KGlobal::config(), "button_tiles" ); + KConfigGroup tilesGroup( TDEGlobal::config(), "button_tiles" ); if( !tilesGroup.readBoolEntry( "Enable" + name + "Tiles", true ) ) { setTile( TQString::null ); return; @@ -171,7 +171,7 @@ TQImage PanelButton::loadTile(const TQString& tile, name += state + ".png"; - TQImage tileImg(KGlobal::dirs()->findResource("tiles", name)); + TQImage tileImg(TDEGlobal::dirs()->findResource("tiles", name)); // scale if size does not match exactly if (!tileImg.isNull() && tileImg.size() != size) @@ -225,7 +225,7 @@ void PanelButton::updateSettings(int category) } if (m_forceStandardCursor == FALSE) - m_changeCursorOverItem = KGlobalSettings::changeCursorOverIcon(); + m_changeCursorOverItem = TDEGlobalSettings::changeCursorOverIcon(); else m_changeCursorOverItem = FALSE; @@ -490,7 +490,7 @@ void PanelButton::mouseMoveEvent(TQMouseEvent *e) TQPoint p(e->pos() - m_lastLeftMouseButtonPress); if (p.manhattanLength() <= 16) { - // KGlobalSettings::dndEventDelay() is not enough! + // TDEGlobalSettings::dndEventDelay() is not enough! return; } @@ -781,7 +781,7 @@ int PanelButton::preferredIconSize(int proposed_size) const { // (re)calculates the icon sizes and report true if they have changed. // Get sizes from icontheme. We assume they are sorted. - KIconTheme *ith = KGlobal::iconLoader()->theme(); + KIconTheme *ith = TDEGlobal::iconLoader()->theme(); if (!ith) { @@ -878,7 +878,7 @@ void PanelButton::loadTiles() void PanelButton::loadIcons() { - KIconLoader * ldr = KGlobal::iconLoader(); + KIconLoader * ldr = TDEGlobal::iconLoader(); TQString nm = m_iconName; KIcon::States defaultState = isEnabled() ? KIcon::DefaultState : KIcon::DisabledState; diff --git a/kicker/libkicker/panner.cpp b/kicker/libkicker/panner.cpp index ddb990d8d..2027f19dd 100644 --- a/kicker/libkicker/panner.cpp +++ b/kicker/libkicker/panner.cpp @@ -42,7 +42,7 @@ Panner::Panner( TQWidget* parent, const char* name ) _cwidth(0), _cheight(0), _cx(0), _cy(0) { - KGlobal::locale()->insertCatalogue("libkicker"); + TDEGlobal::locale()->insertCatalogue("libkicker"); setBackgroundOrigin( AncestorOrigin ); _updateScrollButtonsTimer = new TQTimer(this); diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp index 178277c25..87fd17200 100644 --- a/kicker/libkicker/simplebutton.cpp +++ b/kicker/libkicker/simplebutton.cpp @@ -172,7 +172,7 @@ void SimpleButton::slotSettingsChanged(int category) bool changeCursor; if (m_forceStandardCursor == FALSE) - changeCursor = KGlobalSettings::changeCursorOverIcon(); + changeCursor = TDEGlobalSettings::changeCursorOverIcon(); else changeCursor = FALSE; diff --git a/kicker/menuext/find/findmenu.cpp b/kicker/menuext/find/findmenu.cpp index a3138102b..90c4cb1e7 100644 --- a/kicker/menuext/find/findmenu.cpp +++ b/kicker/menuext/find/findmenu.cpp @@ -44,7 +44,7 @@ FindMenu::~FindMenu() void FindMenu::initialize() { - TQStringList list = KGlobal::dirs()->findAllResources( "data", "kicker/menuext/find/*.desktop", false, true ); + TQStringList list = TDEGlobal::dirs()->findAllResources( "data", "kicker/menuext/find/*.desktop", false, true ); list.sort(); diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp index 9b237a703..032a2ab05 100644 --- a/kicker/menuext/kate/katesessionmenu.cpp +++ b/kicker/menuext/kate/katesessionmenu.cpp @@ -76,7 +76,7 @@ void KateSessionMenu::initialize() insertSeparator(); - TQStringList list = KGlobal::dirs()->findAllResources( "data", "kate/sessions/*.katesession", false, true); + TQStringList list = TDEGlobal::dirs()->findAllResources( "data", "kate/sessions/*.katesession", false, true); for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { KSimpleConfig config( *it, true ); diff --git a/kicker/menuext/konq-profiles/konqy_menu.cpp b/kicker/menuext/konq-profiles/konqy_menu.cpp index cb340caf9..ea7668c8a 100644 --- a/kicker/menuext/konq-profiles/konqy_menu.cpp +++ b/kicker/menuext/konq-profiles/konqy_menu.cpp @@ -41,7 +41,7 @@ KonquerorProfilesMenu::KonquerorProfilesMenu(TQWidget *parent, const char *name, { static bool tdeprintIconsInitialized = false; if ( !tdeprintIconsInitialized ) { - KGlobal::iconLoader()->addAppDir("tdeprint"); + TDEGlobal::iconLoader()->addAppDir("tdeprint"); tdeprintIconsInitialized = true; } } @@ -55,7 +55,7 @@ void KonquerorProfilesMenu::initialize() if (initialized()) clear(); setInitialized(true); - TQStringList profiles = KGlobal::dirs()->findAllResources( "data", "konqueror/profiles/*", false, true ); + TQStringList profiles = TDEGlobal::dirs()->findAllResources( "data", "konqueror/profiles/*", false, true ); m_profiles.resize(profiles.count()); int id=1; diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp index 093b4fc5e..16e11a039 100644 --- a/kicker/menuext/konsole/konsole_mnu.cpp +++ b/kicker/menuext/konsole/konsole_mnu.cpp @@ -54,7 +54,7 @@ KonsoleMenu::KonsoleMenu(TQWidget *parent, const char *name, const TQStringList& KonsoleMenu::~KonsoleMenu() { - KGlobal::locale()->removeCatalogue("libkickermenu_konsole"); + TDEGlobal::locale()->removeCatalogue("libkickermenu_konsole"); } static void insertItemSorted(KPopupMenu *menu, @@ -96,7 +96,7 @@ void KonsoleMenu::initialize() setInitialized(true); - TQStringList list = KGlobal::dirs()->findAllResources("data", + TQStringList list = TDEGlobal::dirs()->findAllResources("data", "konsole/*.desktop", false, true); @@ -126,7 +126,7 @@ void KonsoleMenu::initialize() exec = KRun::binaryName(exec, false); exec = KShell::tildeExpand(exec); - TQString pexec = KGlobal::dirs()->findExe(exec); + TQString pexec = TDEGlobal::dirs()->findExe(exec); if (text.isEmpty() || conf.readEntry("Type") != "KonsoleApplication" || (!exec.isEmpty() && pexec.isEmpty())) @@ -197,7 +197,7 @@ void KonsoleMenu::initialize() delete m_profileMenu; m_profileMenu = new KPopupMenu(this); - TQStringList profiles = KGlobal::dirs()->findAllResources("data", + TQStringList profiles = TDEGlobal::dirs()->findAllResources("data", "konsole/profiles/*", false, true ); m_profiles.resize(profiles.count()); diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp index ee2a5268d..827b0e40c 100644 --- a/kicker/menuext/prefmenu/prefmenu.cpp +++ b/kicker/menuext/prefmenu/prefmenu.cpp @@ -182,7 +182,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev) case KST_KServiceGroup: { - icon = KGlobal::iconLoader()->loadIcon(static_cast<KServiceGroup*>(e)->icon(), + icon = TDEGlobal::iconLoader()->loadIcon(static_cast<KServiceGroup*>(e)->icon(), KIcon::Small); url = "programs:/" + static_cast<KServiceGroup*>(e)->relPath(); break; diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp index cb26e4cae..3fb0b76d9 100644 --- a/kicker/menuext/recentdocs/recentdocsmenu.cpp +++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp @@ -119,7 +119,7 @@ void RecentDocsMenu::mouseMoveEvent(TQMouseEvent* e) { int dragLength = (e->pos() - _mouseDown).manhattanLength(); - if (dragLength <= KGlobalSettings::dndEventDelay()) + if (dragLength <= TDEGlobalSettings::dndEventDelay()) return; // ignore it int id = idAt(_mouseDown); diff --git a/kicker/menuext/remote/remotemenu.cpp b/kicker/menuext/remote/remotemenu.cpp index c09f9a825..49cc0db79 100644 --- a/kicker/menuext/remote/remotemenu.cpp +++ b/kicker/menuext/remote/remotemenu.cpp @@ -42,10 +42,10 @@ RemoteMenu::RemoteMenu(TQWidget *parent, const char *name, const TQStringList &/*args*/) : KPanelMenu(parent, name), KDirNotify() { - KGlobal::dirs()->addResourceType("remote_entries", + TDEGlobal::dirs()->addResourceType("remote_entries", KStandardDirs::kde_default("data") + "remoteview"); - TQString path = KGlobal::dirs()->saveLocation("remote_entries"); + TQString path = TDEGlobal::dirs()->saveLocation("remote_entries"); TQDir dir = path; if (!dir.exists()) @@ -76,7 +76,7 @@ void RemoteMenu::initialize() m_desktopMap.clear(); TQStringList names_found; - TQStringList dirList = KGlobal::dirs()->resourceDirs("remote_entries"); + TQStringList dirList = TDEGlobal::dirs()->resourceDirs("remote_entries"); TQStringList::ConstIterator dirpath = dirList.begin(); TQStringList::ConstIterator end = dirList.end(); diff --git a/kicker/menuext/tdeprint/print_mnu.cpp b/kicker/menuext/tdeprint/print_mnu.cpp index 930dcaf1f..fb10e0f34 100644 --- a/kicker/menuext/tdeprint/print_mnu.cpp +++ b/kicker/menuext/tdeprint/print_mnu.cpp @@ -45,7 +45,7 @@ PrintMenu::PrintMenu(TQWidget *parent, const char *name, const TQStringList & /* { static bool tdeprintIconsInitialized = false; if ( !tdeprintIconsInitialized ) { - KGlobal::iconLoader()->addAppDir("tdeprint"); + TDEGlobal::iconLoader()->addAppDir("tdeprint"); tdeprintIconsInitialized = true; } } diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc index 8e41497b6..5ab089f0d 100644 --- a/kicker/menuext/tom/tom.cc +++ b/kicker/menuext/tom/tom.cc @@ -64,7 +64,7 @@ extern "C" { KDE_EXPORT void* init_kickermenu_tom() { - KGlobal::locale()->insertCatalogue("libkickermenu_tom"); + TDEGlobal::locale()->insertCatalogue("libkickermenu_tom"); return new TOMFactory; } }; @@ -180,7 +180,7 @@ TOM::TOM(TQWidget *parent, const char *name) setCaption(i18n("Task-Oriented Menu")); // KMenu legacy: support some menu config options - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("menus"); m_detailedTaskEntries = config->readBoolEntry("DetailedMenuEntries", false); if (m_detailedTaskEntries) @@ -438,7 +438,7 @@ void TOM::initialize() // TASKS insertTitle(i18n("Tasks"), contextMenuTitleID); - TQStringList dirs = KGlobal::dirs()->findDirs("data", "kicker/tom/"); + TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "kicker/tom/"); TQStringList::ConstIterator dIt = dirs.begin(); TQStringList::ConstIterator dEnd = dirs.end(); @@ -516,7 +516,7 @@ void TOM::initialize() } - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); TQStringList menu_ext = config->readListEntry("Extensions"); if (!menu_ext.isEmpty()) { @@ -628,7 +628,7 @@ void TOM::removeTask() * bool TOM::loadSidePixmap() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); TQColor color = palette().active().highlight(); TQImage image; diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp index 734c6ef8c..d6de4c39d 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -84,7 +84,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) TDEApplication a; a.disableSessionManagement(); - KGlobal::dirs()->addResourceType("applets", KStandardDirs::kde_default("data") + + TDEGlobal::dirs()->addResourceType("applets", KStandardDirs::kde_default("data") + "kicker/applets"); // setup proxy object @@ -162,7 +162,7 @@ void AppletProxy::loadApplet(const TQString& desktopFile, const TQString& config df = finfo.absFilePath(); } else { // locate desktop file - df = KGlobal::dirs()->findResource("applets", desktopFile); + df = TDEGlobal::dirs()->findResource("applets", desktopFile); } TQFile file(df); diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp index a27d59321..55c832439 100644 --- a/kicker/proxy/extensiondebugger.cpp +++ b/kicker/proxy/extensiondebugger.cpp @@ -88,7 +88,7 @@ int main( int argc, char ** argv ) TDEApplication a; a.disableSessionManagement(); - KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") + + TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") + "kicker/extensions"); TQString df; @@ -109,7 +109,7 @@ int main( int argc, char ** argv ) df = finfo.absFilePath(); } else { // locate desktop file - df = KGlobal::dirs()->findResource("extensions", TQString(desktopFile)); + df = TDEGlobal::dirs()->findResource("extensions", TQString(desktopFile)); } // does the config file exist? diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index a2fc35ecc..23289c633 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -70,7 +70,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) TDEApplication a; a.disableSessionManagement(); - KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") + + TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") + "kicker/extensions"); // setup proxy object @@ -134,7 +134,7 @@ void ExtensionProxy::loadExtension(const TQCString& desktopFile, const TQCString df = finfo.absFilePath(); } else { // locate desktop file - df = KGlobal::dirs()->findResource("extensions", TQString(desktopFile)); + df = TDEGlobal::dirs()->findResource("extensions", TQString(desktopFile)); } TQFile file(df); diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp index 131a1d79d..ddeef37a5 100644 --- a/kicker/taskbar/taskbar.cpp +++ b/kicker/taskbar/taskbar.cpp @@ -125,7 +125,7 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TQWidget *parent, const char blocklayout = false; connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); - keys = new KGlobalAccel( TQT_TQOBJECT(this) ); + keys = new TDEGlobalAccel( TQT_TQOBJECT(this) ); #include "taskbarbindings.cpp" keys->readSettings(); keys->updateConnections(); @@ -172,7 +172,7 @@ TQSize TaskBar::sizeHint() const { // get our minimum height based on the minimum button height or the // height of the font in use, which is largest - TQFontMetrics fm(KGlobalSettings::taskbarFont()); + TQFontMetrics fm(TDEGlobalSettings::taskbarFont()); int minButtonHeight = fm.height() > m_settingsObject->minimumButtonHeight() ? fm.height() : m_settingsObject->minimumButtonHeight(); @@ -183,7 +183,7 @@ TQSize TaskBar::sizeHint( KPanelExtension::Position p, TQSize maxSize) const { // get our minimum height based on the minimum button height or the // height of the font in use, which is largest - TQFontMetrics fm(KGlobalSettings::taskbarFont()); + TQFontMetrics fm(TDEGlobalSettings::taskbarFont()); int minButtonHeight = fm.height() > m_settingsObject->minimumButtonHeight() ? fm.height() : m_settingsObject->minimumButtonHeight(); @@ -710,7 +710,7 @@ void TaskBar::reLayout() // number of rows simply depends on our height which is either the // minimum button height or the height of the font in use, whichever is // largest - TQFontMetrics fm(KGlobalSettings::taskbarFont()); + TQFontMetrics fm(TDEGlobalSettings::taskbarFont()); int minButtonHeight = fm.height() > m_settingsObject->minimumButtonHeight() ? fm.height() : m_settingsObject->minimumButtonHeight(); @@ -970,7 +970,7 @@ int TaskBar::taskCount() const int TaskBar::maximumButtonsWithoutShrinking() const { - TQFontMetrics fm(KGlobalSettings::taskbarFont()); + TQFontMetrics fm(TDEGlobalSettings::taskbarFont()); int minButtonHeight = fm.height() > m_settingsObject->minimumButtonHeight() ? fm.height() : m_settingsObject->minimumButtonHeight(); int rows = contentsRect().height() / minButtonHeight; diff --git a/kicker/taskbar/taskbar.h b/kicker/taskbar/taskbar.h index 78f95844c..7c9540efe 100644 --- a/kicker/taskbar/taskbar.h +++ b/kicker/taskbar/taskbar.h @@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class Startup; class Task; -class KGlobalAccel; +class TDEGlobalAccel; class TaskBar : public Panner { @@ -127,7 +127,7 @@ private: bool shouldGroup() const; bool isGrouping; void reGroup(); - KGlobalAccel* keys; + TDEGlobalAccel* keys; KTextShadowEngine* m_textShadowEngine; bool m_ignoreUpdates; TQTimer m_relayoutTimer; diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index 8e10d131b..9d259176f 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/kicker/taskbar/taskcontainer.cpp @@ -577,7 +577,7 @@ void TaskContainer::drawButton(TQPainter *p) bool drawButton = alwaysDrawButtons || (m_mouseOver && !halo && isEnabled() && m_settingsObject->showButtonOnHover()); - TQFont font(KGlobalSettings::taskbarFont()); + TQFont font(TDEGlobalSettings::taskbarFont()); // draw sunken if we contain the active task bool active = false; @@ -1273,7 +1273,7 @@ bool TaskContainer::startDrag(const TQPoint& pos) return false; } - int delay = KGlobalSettings::dndEventDelay(); + int delay = TDEGlobalSettings::dndEventDelay(); if ((m_dragStartPos - pos).manhattanLength() > delay) { @@ -1663,7 +1663,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) data.message = m_startup->text(); data.duration = 4000; data.subtext = i18n("Loading application ..."); - data.icon = KGlobal::iconLoader()->loadIcon(m_startup->icon(), + data.icon = TDEGlobal::iconLoader()->loadIcon(m_startup->icon(), KIcon::Small, KIcon::SizeMedium, KIcon::DefaultState, diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp index 4eab82bc1..f7434e3bc 100644 --- a/kicker/taskmanager/tasklmbmenu.cpp +++ b/kicker/taskmanager/tasklmbmenu.cpp @@ -255,7 +255,7 @@ void TaskLMBMenu::mouseMoveEvent(TQMouseEvent* e) return; } - int delay = KGlobalSettings::dndEventDelay(); + int delay = TDEGlobalSettings::dndEventDelay(); TQPoint newPos(e->pos()); if ((m_dragStartPos - newPos).manhattanLength() > delay) 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; |