summaryrefslogtreecommitdiffstats
path: root/kicker/applets
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/applets')
-rw-r--r--kicker/applets/clock/clock.cpp38
-rw-r--r--kicker/applets/clock/clockapplet.kcfg6
-rw-r--r--kicker/applets/clock/init.cpp4
-rw-r--r--kicker/applets/launcher/quickbutton.cpp6
-rw-r--r--kicker/applets/launcher/quicklauncher.cpp4
-rw-r--r--kicker/applets/lockout/lockout.cpp4
-rw-r--r--kicker/applets/media/mediaapplet.cpp4
-rw-r--r--kicker/applets/menu/menuapplet.cpp4
-rw-r--r--kicker/applets/minipager/pagerapplet.cpp10
-rw-r--r--kicker/applets/minipager/pagerapplet.h2
-rw-r--r--kicker/applets/minipager/pagerbutton.cpp2
-rw-r--r--kicker/applets/naughty/NaughtyApplet.cpp6
-rw-r--r--kicker/applets/run/runapplet.cpp8
-rw-r--r--kicker/applets/swallow/swallow.cpp10
-rw-r--r--kicker/applets/swallow/swallow.h8
-rw-r--r--kicker/applets/systemtray/systemtrayapplet.cpp4
-rw-r--r--kicker/applets/taskbar/taskbarapplet.cpp4
-rw-r--r--kicker/applets/trash/trashapplet.cpp4
18 files changed, 64 insertions, 64 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()
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 21:07:09 +0000