summaryrefslogtreecommitdiffstats
path: root/kicker/applets
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/applets')
-rw-r--r--kicker/applets/clock/analog.ui16
-rw-r--r--kicker/applets/clock/clock.cpp80
-rw-r--r--kicker/applets/clock/clock.h4
-rw-r--r--kicker/applets/clock/digital.ui14
-rw-r--r--kicker/applets/clock/fuzzy.ui14
-rw-r--r--kicker/applets/clock/settings.ui22
-rw-r--r--kicker/applets/clock/zone.cpp2
-rw-r--r--kicker/applets/launcher/configdlgbase.ui16
-rw-r--r--kicker/applets/launcher/flowgridmanager.h4
-rw-r--r--kicker/applets/launcher/popularity.cpp2
-rw-r--r--kicker/applets/launcher/quickaddappsmenu.cpp2
-rw-r--r--kicker/applets/launcher/quickbutton.cpp2
-rw-r--r--kicker/applets/launcher/quicklauncher.cpp22
-rw-r--r--kicker/applets/launcher/quicklauncher.h2
-rw-r--r--kicker/applets/lockout/lockout.cpp30
-rw-r--r--kicker/applets/lockout/lockout.h2
-rw-r--r--kicker/applets/media/mediaapplet.cpp6
-rw-r--r--kicker/applets/media/preferencesdialog.cpp4
-rw-r--r--kicker/applets/menu/menuapplet.cpp8
-rw-r--r--kicker/applets/menu/menuapplet.h4
-rw-r--r--kicker/applets/minipager/pagerapplet.cpp18
-rw-r--r--kicker/applets/minipager/pagerapplet.h2
-rw-r--r--kicker/applets/minipager/pagerbutton.cpp46
-rw-r--r--kicker/applets/naughty/NaughtyApplet.cpp6
-rw-r--r--kicker/applets/naughty/NaughtyApplet.h2
-rw-r--r--kicker/applets/naughty/NaughtyProcessMonitor.cpp18
-rw-r--r--kicker/applets/run/runapplet.cpp12
-rw-r--r--kicker/applets/swallow/prefwidgetbase.ui8
-rw-r--r--kicker/applets/swallow/swallow.cpp22
-rw-r--r--kicker/applets/swallow/swallow.h4
-rw-r--r--kicker/applets/systemtray/systemtrayapplet.cpp74
-rw-r--r--kicker/applets/systemtray/systemtrayapplet.desktop4
-rw-r--r--kicker/applets/systemtray/systemtrayapplet.h4
-rw-r--r--kicker/applets/taskbar/taskbarapplet.cpp8
34 files changed, 242 insertions, 242 deletions
diff --git a/kicker/applets/clock/analog.ui b/kicker/applets/clock/analog.ui
index 4a20312ec..db20618b1 100644
--- a/kicker/applets/clock/analog.ui
+++ b/kicker/applets/clock/analog.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>AnalogWidget</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -75,7 +75,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -97,7 +97,7 @@
</property>
<widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
<property name="name">
- <cstring>layout9</cstring>
+ <cstring>tqlayout9</cstring>
</property>
<grid>
<property name="name">
@@ -149,7 +149,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -241,7 +241,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>310</width>
<height>20</height>
@@ -269,7 +269,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>50</height>
@@ -334,8 +334,8 @@
<include location="local" impldecl="in implementation">kdialog.h</include>
<include location="local" impldecl="in implementation">kfontrequester.h</include>
</includes>
-<layoutdefaults spacing="3" margin="6"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="3" margin="6"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 26f1ae4c0..096b0301b 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -134,7 +134,7 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent,
connect(fuzzyPage->kcfg_FuzzyShowDayOfWeek, TQT_SIGNAL(toggled(bool)),
TQT_SLOT(dateToggled()));
- addPage(settings, i18n("General"), TQString::fromLatin1("package_settings"));
+ addPage(settings, i18n("General"), TQString::tqfromLatin1("package_settings"));
}
void KConfigDialogSingle::updateSettings()
@@ -253,7 +253,7 @@ void PlainClock::updateClock()
void PlainClock::loadSettings()
{
setFrameStyle(_prefs->plainShowFrame() ? Panel | Sunken : NoFrame);
- setAlignment(AlignVCenter | AlignHCenter | SingleLine);
+ tqsetAlignment(AlignVCenter | AlignHCenter | SingleLine);
setFont(_prefs->plainFont());
}
@@ -837,8 +837,8 @@ void FuzzyClock::drawContents(TQPainter *p)
// so we only have to update phStart
}
if (phStart >= 0)
- newTimeStr.replace(phStart, phLength, hourNames[realHour]);
- newTimeStr.replace(0, 1, TQString(newTimeStr.at(0).upper()));
+ newTimeStr.tqreplace(phStart, phLength, hourNames[realHour]);
+ newTimeStr.tqreplace(0, 1, TQString(newTimeStr.at(0).upper()));
}
} else if (_prefs->fuzzyness() == 3) {
newTimeStr = dayTime[_time.hour() / 3];
@@ -902,8 +902,8 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions,
_disableCalendar(false),
_clock(0),
_timer(new TQTimer(this, "ClockApplet::_timer")),
- m_layoutTimer(new TQTimer(this, "m_layoutTimer")),
- m_layoutDelay(0),
+ m_tqlayoutTimer(new TQTimer(this, "m_tqlayoutTimer")),
+ m_tqlayoutDelay(0),
m_followBackgroundSetting(true),
m_dateFollowBackgroundSetting(true),
TZoffset(0),
@@ -919,16 +919,16 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions,
setBackgroundOrigin(AncestorOrigin);
_dayOfWeek = new TQLabel(this);
- _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter | WordBreak);
+ _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak);
_dayOfWeek->setBackgroundOrigin(AncestorOrigin);
_dayOfWeek->installEventFilter(this); // catch mouse clicks
_date = new TQLabel(this);
- _date->setAlignment(AlignVCenter | AlignHCenter | WordBreak);
+ _date->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak);
_date->setBackgroundOrigin(AncestorOrigin);
_date->installEventFilter(this); // catch mouse clicks
- connect(m_layoutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fixupLayout()));
+ connect(m_tqlayoutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fixupLayout()));
connect(_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdate()));
connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(globalPaletteChange()));
@@ -991,18 +991,18 @@ int ClockApplet::widthForHeight(int h) const
bool mustShowDate = showDate || (zone->zoneIndex() != 0);
if (mustShowDate)
{
- _date->setAlignment(AlignVCenter | AlignHCenter);
+ _date->tqsetAlignment(AlignVCenter | AlignHCenter);
if (!dateToSide)
{
- shareDateHeight = _date->sizeHint().height();
+ shareDateHeight = _date->tqsizeHint().height();
}
}
if (showDayOfWeek)
{
- _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter);
+ _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter);
if (!dateToSide)
{
- shareDayOfWeekHeight = _dayOfWeek->sizeHint().height();
+ shareDayOfWeekHeight = _dayOfWeek->tqsizeHint().height();
}
}
@@ -1018,8 +1018,8 @@ int ClockApplet::widthForHeight(int h) const
}
else
{
- int dateWidth = mustShowDate ? _date->sizeHint().width() + 4 : 0;
- int dayOfWeekWidth = showDayOfWeek ? _dayOfWeek->sizeHint().width() + 4 : 0;
+ int dateWidth = mustShowDate ? _date->tqsizeHint().width() + 4 : 0;
+ int dayOfWeekWidth = showDayOfWeek ? _dayOfWeek->tqsizeHint().width() + 4 : 0;
if (dateToSide)
{
@@ -1075,13 +1075,13 @@ int ClockApplet::widthForHeight(int h) const
_clock->widget()->move(0, 0);
if (showDayOfWeek)
{
- _dayOfWeek->setFixedSize(w, _dayOfWeek->sizeHint().height());
+ _dayOfWeek->setFixedSize(w, _dayOfWeek->tqsizeHint().height());
_dayOfWeek->move(0, _clock->widget()->height());
}
if (mustShowDate)
{
- _date->setFixedSize(w, _date->sizeHint().height());
+ _date->setFixedSize(w, _date->tqsizeHint().height());
_date->move(0, _clock->widget()->height() + shareDayOfWeekHeight);
}
}
@@ -1105,16 +1105,16 @@ int ClockApplet::heightForWidth(int w) const
// add 4 pixels in height for each of date+dayOfWeek, if visible
if (showDayOfWeek)
{
- if (_dayOfWeek->minimumSizeHint().width() > w)
+ if (_dayOfWeek->tqminimumSizeHint().width() > w)
{
- _dayOfWeek->setAlignment(AlignVCenter | WordBreak);
+ _dayOfWeek->tqsetAlignment(AlignVCenter | WordBreak);
}
else
{
- _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter | WordBreak);
+ _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak);
}
- _dayOfWeek->setFixedSize(w, _dayOfWeek->minimumSizeHint().height());
+ _dayOfWeek->setFixedSize(w, _dayOfWeek->tqminimumSizeHint().height());
_dayOfWeek->move(0, clockHeight);
clockHeight += _dayOfWeek->height();
@@ -1127,10 +1127,10 @@ int ClockApplet::heightForWidth(int w) const
// display on panel that is too narrow and then they made it wider
const_cast<ClockApplet*>(this)->updateDateLabel(false);
- if (_date->minimumSizeHint().width() > w)
+ if (_date->tqminimumSizeHint().width() > w)
{
TQString dateStr = _date->text();
- // if we're too wide to fit, replace the first non-digit from the end with a space
+ // if we're too wide to fit, tqreplace the first non-digit from the end with a space
int p = dateStr.findRev(TQRegExp("[^0-9]"));
if (p > 0)
{
@@ -1138,13 +1138,13 @@ int ClockApplet::heightForWidth(int w) const
}
}
- if (_date->minimumSizeHint().width() > w)
+ if (_date->tqminimumSizeHint().width() > w)
{
- _date->setAlignment(AlignVCenter | WordBreak);
+ _date->tqsetAlignment(AlignVCenter | WordBreak);
}
else
{
- _date->setAlignment(AlignVCenter | AlignHCenter | WordBreak);
+ _date->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak);
}
_date->setFixedSize(w, _date->heightForWidth(w));
_date->move(0, clockHeight);
@@ -1283,7 +1283,7 @@ void ClockApplet::reconfigure()
_clock->widget()->installEventFilter(this); // catch mouse clicks
_clock->widget()->show();
- _clock->forceUpdate(); /* force repaint */
+ _clock->forceUpdate(); /* force tqrepaint */
if (showDayOfWeek)
{
@@ -1552,7 +1552,7 @@ void ClockApplet::aboutToShowContextMenu()
menu->insertTitle( SmallIcon( "clock" ), i18n( "Clock" ) );
KLocale *loc = KGlobal::locale();
- TQDateTime dt = TQDateTime::currentDateTime();
+ TQDateTime dt = TQDateTime::tqcurrentDateTime();
dt = dt.addSecs(TZoffset);
KPopupMenu *copyMenu = new KPopupMenu( menu );
@@ -1579,7 +1579,7 @@ void ClockApplet::aboutToShowContextMenu()
}
else
{
- zoneMenu->insertItem(i18n(zone->zone(i).utf8()).replace("_", " "), 500 + i);
+ zoneMenu->insertItem(i18n(zone->zone(i).utf8()).tqreplace("_", " "), 500 + i);
}
}
zoneMenu->setItemChecked(500 + zone->zoneIndex(),true);
@@ -1626,7 +1626,7 @@ TQTime ClockApplet::clockGetTime()
TQDate ClockApplet::clockGetDate()
{
- return TQDateTime::currentDateTime().addSecs(TZoffset).date();
+ return TQDateTime::tqcurrentDateTime().addSecs(TZoffset).date();
}
void ClockApplet::showZone(int z)
@@ -1634,7 +1634,7 @@ void ClockApplet::showZone(int z)
zone->setZone(z);
TZoffset = zone->calc_TZ_offset( zone->zone() );
updateDateLabel();
- _clock->forceUpdate(); /* force repaint */
+ _clock->forceUpdate(); /* force tqrepaint */
}
void ClockApplet::nextZone()
@@ -1710,7 +1710,7 @@ void ClockApplet::updateDateLabel(bool reLayout)
if (zone->zoneIndex() != 0)
{
TQString zone_s = i18n(zone->zone().utf8());
- _date->setText(zone_s.mid(zone_s.find('/') + 1).replace("_", " "));
+ _date->setText(zone_s.mid(zone_s.find('/') + 1).tqreplace("_", " "));
_date->setShown(true);
}
else
@@ -1727,8 +1727,8 @@ void ClockApplet::updateDateLabel(bool reLayout)
_calendar->setDate(_lastDate);
}
- m_layoutTimer->stop();
- m_layoutTimer->start(m_layoutDelay, true);
+ m_tqlayoutTimer->stop();
+ m_tqlayoutTimer->start(m_tqlayoutDelay, true);
}
}
@@ -1748,7 +1748,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
if (!activeZone.isEmpty())
{
activeZone = i18n(activeZone.utf8());
- data.subtext.append("<br>").append(activeZone.mid(activeZone.find('/') + 1).replace("_", " "));
+ data.subtext.append("<br>").append(activeZone.mid(activeZone.find('/') + 1).tqreplace("_", " "));
}
}
else
@@ -1771,7 +1771,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
if (activeIndex == i)
{
- data.message = m_zone.mid(m_zone.find('/') + 1).replace("_", " ");
+ data.message = m_zone.mid(m_zone.find('/') + 1).tqreplace("_", " ");
data.message += " " + _time + "<br>" + _date;
}
else
@@ -1782,7 +1782,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
}
else
{
- data.subtext += "<b>" + m_zone.mid(m_zone.find('/') + 1).replace("_", " ") + "</b>";
+ data.subtext += "<b>" + m_zone.mid(m_zone.find('/') + 1).tqreplace("_", " ") + "</b>";
}
data.subtext += " " + _time + ", " + _date + "<br>";
}
@@ -1798,7 +1798,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
void ClockApplet::fixupLayout()
{
- m_layoutDelay = 0;
+ m_tqlayoutDelay = 0;
// ensure we have the right widget line up in horizontal mode
// when we are showing date beside the clock
@@ -1851,7 +1851,7 @@ 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(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset));
+ tipText = KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime().addSecs(m_clock->TZoffset));
}
else
{
@@ -1863,7 +1863,7 @@ void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ )
tipText += "\n" + i18n("Showing time for %1").arg(i18n(m_clock->timezones()->zone().utf8()), false);
}
- tip(m_clock->geometry(), tipText);
+ tip(m_clock->tqgeometry(), tipText);
}
//************************************************************
diff --git a/kicker/applets/clock/clock.h b/kicker/applets/clock/clock.h
index 144fb50c6..753598e18 100644
--- a/kicker/applets/clock/clock.h
+++ b/kicker/applets/clock/clock.h
@@ -326,8 +326,8 @@ class ClockApplet : public KPanelApplet, public KickerTip::Client, public DCOPOb
TQLabel *_dayOfWeek;
TQDate _lastDate;
TQTimer *_timer;
- TQTimer *m_layoutTimer;
- int m_layoutDelay;
+ TQTimer *m_tqlayoutTimer;
+ int m_tqlayoutDelay;
bool m_followBackgroundSetting;
bool m_dateFollowBackgroundSetting;
int TZoffset;
diff --git a/kicker/applets/clock/digital.ui b/kicker/applets/clock/digital.ui
index 256bca99b..f63b783c1 100644
--- a/kicker/applets/clock/digital.ui
+++ b/kicker/applets/clock/digital.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>DigitalWidget</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -83,7 +83,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -116,7 +116,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout14</cstring>
+ <cstring>tqlayout14</cstring>
</property>
<grid>
<property name="name">
@@ -193,7 +193,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>110</width>
<height>20</height>
@@ -226,7 +226,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -295,8 +295,8 @@
<slots>
<slot>kcfg_DigitalLCDStyle_stateChanged( int )</slot>
</slots>
-<layoutdefaults spacing="3" margin="6"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="3" margin="6"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
diff --git a/kicker/applets/clock/fuzzy.ui b/kicker/applets/clock/fuzzy.ui
index 04e910340..e67bf0c7a 100644
--- a/kicker/applets/clock/fuzzy.ui
+++ b/kicker/applets/clock/fuzzy.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>FuzzyWidget</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -79,7 +79,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -109,7 +109,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>30</height>
@@ -126,7 +126,7 @@
</widget>
<widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="3">
<property name="name">
- <cstring>layout11</cstring>
+ <cstring>tqlayout11</cstring>
</property>
<grid>
<property name="name">
@@ -153,7 +153,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -277,8 +277,8 @@
<include location="local" impldecl="in implementation">kdialog.h</include>
<include location="local" impldecl="in implementation">kfontrequester.h</include>
</includes>
-<layoutdefaults spacing="3" margin="6"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="3" margin="6"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui
index 215aa5433..02baca77b 100644
--- a/kicker/applets/clock/settings.ui
+++ b/kicker/applets/clock/settings.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>SettingsWidget</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -36,7 +36,7 @@
</property>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout14</cstring>
+ <cstring>tqlayout14</cstring>
</property>
<hbox>
<property name="name">
@@ -102,7 +102,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -188,7 +188,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -284,7 +284,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>230</width>
<height>20</height>
@@ -306,7 +306,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -371,7 +371,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>343</width>
<height>20</height>
@@ -380,7 +380,7 @@
</spacer>
<widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
<property name="name">
- <cstring>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<hbox>
<property name="name">
@@ -421,7 +421,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>100</height>
@@ -501,8 +501,8 @@
<slots>
<slot>configureType()</slot>
</slots>
-<layoutdefaults spacing="3" margin="6"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="3" margin="6"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp
index 320d84b4c..b44ba0de5 100644
--- a/kicker/applets/clock/zone.cpp
+++ b/kicker/applets/clock/zone.cpp
@@ -105,7 +105,7 @@ void Zone::readZoneList(KListView *listView )
if (!comment.isEmpty())
comment = i18n(comment.utf8());
- const TQStringList KontCity = TQStringList::split("/", i18n(tzName.utf8()).replace("_", " "));
+ const TQStringList KontCity = TQStringList::split("/", i18n(tzName.utf8()).tqreplace("_", " "));
TQListViewItem* Kontinent = KontinentMap[KontCity[0]];
if (!Kontinent) {
KontinentMap[KontCity[0]] = new TQListViewItem(listView, KontCity[0]);
diff --git a/kicker/applets/launcher/configdlgbase.ui b/kicker/applets/launcher/configdlgbase.ui
index bfb1bc4e6..7a2ded479 100644
--- a/kicker/applets/launcher/configdlgbase.ui
+++ b/kicker/applets/launcher/configdlgbase.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>ConfigDlgBase</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -75,7 +75,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>332</width>
<height>20</height>
@@ -97,7 +97,7 @@
</property>
<widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="3">
<property name="name">
- <cstring>layout1</cstring>
+ <cstring>tqlayout1</cstring>
</property>
<grid>
<property name="name">
@@ -130,7 +130,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>140</width>
<height>20</height>
@@ -144,7 +144,7 @@
<property name="text">
<string>Short Term</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -155,7 +155,7 @@
<property name="text">
<string>Long Term</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -184,7 +184,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>50</width>
<height>20</height>
@@ -265,7 +265,7 @@
<slot>setEnabled(bool)</slot>
</connection>
</connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
diff --git a/kicker/applets/launcher/flowgridmanager.h b/kicker/applets/launcher/flowgridmanager.h
index 521490c51..5aaa814bb 100644
--- a/kicker/applets/launcher/flowgridmanager.h
+++ b/kicker/applets/launcher/flowgridmanager.h
@@ -13,8 +13,8 @@
class FlowGridManager {
-// Determine if two FlowGridManager objs have the same layout. They may or
-// may not have the same input parameters, but the resulting layout is identical.
+// Determine if two FlowGridManager objs have the same tqlayout. They may or
+// may not have the same input parameters, but the resulting tqlayout is identical.
friend bool operator== ( const FlowGridManager & gp1, const FlowGridManager & gp2 );
public:
diff --git a/kicker/applets/launcher/popularity.cpp b/kicker/applets/launcher/popularity.cpp
index a22a98c99..e446a2ec7 100644
--- a/kicker/applets/launcher/popularity.cpp
+++ b/kicker/applets/launcher/popularity.cpp
@@ -182,7 +182,7 @@ void PopularityStatistics::moveToTop(const TQStringList& newTopServiceList)
//kdDebug() << "->Re-Added service " <<
//ranking[serviceIndex].popularity
// << " " << *servIt << endl;
- //kdDebug() << "...was replaced by " << *servIt << endl;
+ //kdDebug() << "...was tqreplaced by " << *servIt << endl;
}
else
{
diff --git a/kicker/applets/launcher/quickaddappsmenu.cpp b/kicker/applets/launcher/quickaddappsmenu.cpp
index 0eebec315..7dcb16098 100644
--- a/kicker/applets/launcher/quickaddappsmenu.cpp
+++ b/kicker/applets/launcher/quickaddappsmenu.cpp
@@ -53,7 +53,7 @@ QuickAddAppsMenu::QuickAddAppsMenu(TQWidget *target, TQWidget *parent, const TQS
void QuickAddAppsMenu::slotExec(int id)
{
- if (!entryMap_.contains(id)) return;
+ if (!entryMap_.tqcontains(id)) return;
KSycocaEntry * e = entryMap_[id];
KService::Ptr service = static_cast<KService *>(e);
emit addAppBefore(locate("apps", service->desktopEntryPath()),_sender);
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index 2ac0742ca..d002b56ce 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -140,7 +140,7 @@ QuickButton::QuickButton(const TQString &u, KAction* configAction,
TQToolTip::add(this, _qurl->name());
resize(int(DEFAULT_ICON_DIM),int(DEFAULT_ICON_DIM));
- TQBrush bgbrush(colorGroup().brush(TQColorGroup::Background));
+ TQBrush bgbrush(tqcolorGroup().brush(TQColorGroup::Background));
QuickAddAppsMenu *addAppsMenu = new QuickAddAppsMenu(
parent, this, _qurl->url());
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp
index a278b39c9..6b56032aa 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quicklauncher.cpp
@@ -438,11 +438,11 @@ void QuickLauncher::addApp(TQString url, int index, bool manuallyAdded)
}
}
- updateInsertionPosToStatusQuo();
+ updateInsertionPosTotqStatusQuo();
saveConfig();
}
-void QuickLauncher::updateInsertionPosToStatusQuo()
+void QuickLauncher::updateInsertionPosTotqStatusQuo()
{
// Update the app ordering map, so that next time,
// addApp(url,manAdded) (without index) will insert the
@@ -633,7 +633,7 @@ void QuickLauncher::dropEvent(TQDropEvent *e)
clearTempButtons();
refreshContents();
saveConfig();
- updateInsertionPosToStatusQuo();
+ updateInsertionPosTotqStatusQuo();
}
// insert dragbuttons at index in m_newButtons. Put result in m_buttons
@@ -828,7 +828,7 @@ void QuickLauncher::loadConfig()
for (n=0; n<int(m_buttons->size()); ++n)
{
QuickButton* button = (*m_buttons)[n];
- if (volatileButtons.contains(button->menuId()) == false)
+ if (volatileButtons.tqcontains(button->menuId()) == false)
{
button->setSticky(true);
}
@@ -912,7 +912,7 @@ void QuickLauncher::serviceStartedByStorageId(TQString /*starter*/, TQString sto
QuickURL url = QuickURL(locate("apps", service->desktopEntryPath()));
TQString desktopMenuId(url.menuId());
kdDebug() << "storageId=" << storageId << " desktopURL=" << desktopMenuId << endl;
- // A service was started somwhere else. If the quicklauncher contains
+ // A service was started somwhere else. If the quicklauncher tqcontains
// this service too, we flash the icon
QuickButton *startedButton = 0;
std::set<TQString> buttonIdSet;
@@ -1040,19 +1040,19 @@ void QuickLauncher::updateStickyHighlightLayer()
m_stickyHighlightLayer = TQImage(width(), height(), 32);
m_stickyHighlightLayer.setAlphaBuffer(true);
int pix, tlPix, brPix, w(width()), h(height());
- QRgb transparent(qRgba(0, 0, 0, 0));
+ QRgb transparent(tqRgba(0, 0, 0, 0));
for (int y = h-1; y >= 0; --y)
{
for (int x = w-1; x >= 0; --x)
{
- pix = qRed(areaLayer.pixel(x, y));
+ pix = tqRed(areaLayer.pixel(x, y));
if (pix == 0)
{
- tlPix = (y>0 && x>0) ? qRed(areaLayer.pixel(x-1,y-1)) : 255;
- brPix = (y<h-1 && x<w-1) ? qRed(areaLayer.pixel(x+1,y+1)) : 255;
+ tlPix = (y>0 && x>0) ? tqRed(areaLayer.pixel(x-1,y-1)) : 255;
+ brPix = (y<h-1 && x<w-1) ? tqRed(areaLayer.pixel(x+1,y+1)) : 255;
int c = tlPix-brPix < 0 ? 255 : 0;
int alpha = abs(tlPix-brPix)/2;
- m_stickyHighlightLayer.setPixel(x, y, qRgba(c, c, c, alpha));
+ m_stickyHighlightLayer.setPixel(x, y, tqRgba(c, c, c, alpha));
}
else
{
@@ -1060,7 +1060,7 @@ void QuickLauncher::updateStickyHighlightLayer()
}
}
}
- repaint();
+ tqrepaint();
}
void QuickLauncher::paintEvent(TQPaintEvent* e)
diff --git a/kicker/applets/launcher/quicklauncher.h b/kicker/applets/launcher/quicklauncher.h
index 2dadf6344..709904858 100644
--- a/kicker/applets/launcher/quicklauncher.h
+++ b/kicker/applets/launcher/quicklauncher.h
@@ -111,7 +111,7 @@ protected slots:
void slotStickyToggled();
protected:
- void updateInsertionPosToStatusQuo();
+ void updateInsertionPosTotqStatusQuo();
void updateStickyHighlightLayer();
QuickButton* createButton(TQString url);
virtual void paintEvent(TQPaintEvent* e);
diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp
index 3bc53efae..c0f0f30c8 100644
--- a/kicker/applets/lockout/lockout.cpp
+++ b/kicker/applets/lockout/lockout.cpp
@@ -63,13 +63,13 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name
setBackgroundOrigin( AncestorOrigin );
if ( orientation() == Horizontal )
- layout = new TQBoxLayout( this, TQBoxLayout::TopToBottom );
+ tqlayout = new TQBoxLayout( this, TQBoxLayout::TopToBottom );
else
- layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight );
+ tqlayout = new TQBoxLayout( this, TQBoxLayout::LeftToRight );
- layout->setAutoAdd( true );
- layout->setMargin( 0 );
- layout->setSpacing( 0 );
+ tqlayout->setAutoAdd( true );
+ tqlayout->setMargin( 0 );
+ tqlayout->setSpacing( 0 );
lockButton = new SimpleButton( this, "lock");
logoutButton = new SimpleButton( this, "logout");
@@ -94,8 +94,8 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name
if (!kapp->authorize("logout"))
logoutButton->hide();
- lockButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
- logoutButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
+ lockButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
+ logoutButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
@@ -113,31 +113,31 @@ Lockout::~Lockout()
// direction and wasting a lot of space.
void Lockout::checkLayout( int height ) const
{
- TQSize s = minimumSizeHint();
- TQBoxLayout::Direction direction = layout->direction();
+ TQSize s = tqminimumSizeHint();
+ TQBoxLayout::Direction direction = tqlayout->direction();
if ( direction == TQBoxLayout::LeftToRight &&
( ( orientation() == Vertical && s.width() - 2 >= height ) ||
( orientation() == Horizontal && s.width() - 2 < height ) ) ) {
- layout->setDirection( TQBoxLayout::TopToBottom );
+ tqlayout->setDirection( TQBoxLayout::TopToBottom );
}
else if ( direction == TQBoxLayout::TopToBottom &&
( ( orientation() == Vertical && s.height() - 2 < height ) ||
( orientation() == Horizontal && s.height() - 2 >= height ) ) ) {
- layout->setDirection( TQBoxLayout::LeftToRight );
+ tqlayout->setDirection( TQBoxLayout::LeftToRight );
}
}
int Lockout::widthForHeight( int height ) const
{
checkLayout( height );
- return sizeHint().width();
+ return tqsizeHint().width();
}
int Lockout::heightForWidth( int width ) const
{
checkLayout( width );
- return sizeHint().height();
+ return tqsizeHint().height();
}
void Lockout::lock()
@@ -177,9 +177,9 @@ void Lockout::mouseMoveEvent(TQMouseEvent* e)
void Lockout::propagateMouseEvent(TQMouseEvent* e)
{
if ( !isTopLevel() ) {
- TQMouseEvent me(e->type(), mapTo( topLevelWidget(), e->pos() ),
+ TQMouseEvent me(e->type(), mapTo( tqtopLevelWidget(), e->pos() ),
e->globalPos(), e->button(), e->state() );
- TQApplication::sendEvent( topLevelWidget(), &me );
+ TQApplication::sendEvent( tqtopLevelWidget(), &me );
}
}
diff --git a/kicker/applets/lockout/lockout.h b/kicker/applets/lockout/lockout.h
index 6be995790..e93a35d50 100644
--- a/kicker/applets/lockout/lockout.h
+++ b/kicker/applets/lockout/lockout.h
@@ -44,7 +44,7 @@ private:
void checkLayout( int height ) const;
SimpleButton *lockButton, *logoutButton;
- TQBoxLayout *layout;
+ TQBoxLayout *tqlayout;
bool bTransparent;
};
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp
index b137b5d5c..774724609 100644
--- a/kicker/applets/media/mediaapplet.cpp
+++ b/kicker/applets/media/mediaapplet.cpp
@@ -285,7 +285,7 @@ void MediaApplet::slotNewItems(const KFileItemList &entries)
}
}
- if(!found && !mExcludedList.contains(it.current()->url().url()) )
+ if(!found && !mExcludedList.tqcontains(it.current()->url().url()) )
{
MediumButton *button = new MediumButton(this, *it.current());
button->show();
@@ -336,7 +336,7 @@ void MediaApplet::slotRefreshItems(const KFileItemList &entries)
if(button->fileItem().url()==(*it.current()).url())
{
- if(mExcludedTypesList.contains(mimetype))
+ if(mExcludedTypesList.tqcontains(mimetype))
{
mButtonList.remove(button);
delete button;
@@ -350,7 +350,7 @@ void MediaApplet::slotRefreshItems(const KFileItemList &entries)
}
}
- if(!found && !mExcludedTypesList.contains(mimetype) && !mExcludedList.contains(it.current()->url().url()) )
+ if(!found && !mExcludedTypesList.tqcontains(mimetype) && !mExcludedList.tqcontains(it.current()->url().url()) )
{
MediumButton *button = new MediumButton(this, *it.current());
button->show();
diff --git a/kicker/applets/media/preferencesdialog.cpp b/kicker/applets/media/preferencesdialog.cpp
index 8d9cdcc94..b52aad034 100644
--- a/kicker/applets/media/preferencesdialog.cpp
+++ b/kicker/applets/media/preferencesdialog.cpp
@@ -125,7 +125,7 @@ void PreferencesDialog::setExcludedMediumTypes(TQStringList excludedTypesList)
{
if ((*it)->name().startsWith("media/"))
{
- bool ok=excludedTypesList.contains((*it)->name())==0;
+ bool ok=excludedTypesList.tqcontains((*it)->name())==0;
MediumTypeItem *item = new MediumTypeItem(mpMediumTypesListView, (*it)->comment(), (*it)->name());
item->setOn(ok);
}
@@ -156,7 +156,7 @@ void PreferencesDialog::setExcludedMedia(TQStringList excludedList)
{
++it;
- bool ok = excludedList.contains(file->url().url())==0;
+ bool ok = excludedList.tqcontains(file->url().url())==0;
MediumItem *item = new MediumItem(mpMediaListView,
file->text(), *file);
item->setOn(ok);
diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp
index 472f3bd0d..662859bd5 100644
--- a/kicker/applets/menu/menuapplet.cpp
+++ b/kicker/applets/menu/menuapplet.cpp
@@ -48,7 +48,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
This is because TQMenuBar tries really hard to keep its preffered size,
se even if the X window for the menubar has the size enforced by this
applet, Qt thinks it has the size Qt wants. This results in parts
- of the menubar not being repainted. Also, old KMenuBar always forced
+ of the menubar not being tqrepainted. Also, old KMenuBar always forced
with to be the width of the screen, so even if the menubar has only
few entries, this applet will still indicate the menubar doesn't
fit completely in it. There's no way to fix this, besides upgrading
@@ -266,7 +266,7 @@ void Applet::positionChange( Position )
// Kicker's frame).
void Applet::updateTopEdgeOffset()
{
- TQPoint p = topLevelWidget()->mapToGlobal( TQPoint( 0, 0 ));
+ TQPoint p = tqtopLevelWidget()->mapToGlobal( TQPoint( 0, 0 ));
if( p.y() <= 2 ) // 2 = work also when running in appletproxy
topEdgeOffset = mapToGlobal( TQPoint( 0, 0 )).y() - p.y();
else
@@ -489,12 +489,12 @@ void MenuEmbed::setMinimumSize( int w, int h )
void MenuEmbed::setBackground()
{
- const TQPixmap *pbg = parentWidget()->backgroundPixmap();
+ const TQPixmap *pbg = tqparentWidget()->backgroundPixmap();
if (pbg)
{
TQPixmap bg(width(), height());
- bg.fill(parentWidget(), pos());
+ bg.fill(tqparentWidget(), pos());
setPaletteBackgroundPixmap(bg);
setBackgroundOrigin(WidgetOrigin);
}
diff --git a/kicker/applets/menu/menuapplet.h b/kicker/applets/menu/menuapplet.h
index 5ba54cd66..6f67cbed4 100644
--- a/kicker/applets/menu/menuapplet.h
+++ b/kicker/applets/menu/menuapplet.h
@@ -51,11 +51,11 @@ class MenuEmbed;
*
* @description All status change, such as when an window is activated,
* a new window popped up, etc, is received via @ref KWin::WindowInfo and @ref
- * NETWinInfo. Status changes for X selections are done via KSelectionWatcher.
+ * NETWinInfo. tqStatus changes for X selections are done via KSelectionWatcher.
*
* How it works in broad terms: KickerMenuApplet gets notified as soon a window
* changes(a new pops up etc.) and accordingly updates the list @ref menus,
- * which contains all known menus. When a new window gains focus, it looks up the
+ * which tqcontains all known menus. When a new window gains focus, it looks up the
* correct MenuEmbed in @ref menus, and then switches to that one.
*
* The documentation is a bit rusty -- read it with a critical eye.
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index dc2431e15..ecdcd4509 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -83,7 +83,7 @@ extern "C"
KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
TQWidget *parent, const char *name)
: KPanelApplet( configFile, type, actions, parent, name ),
- m_layout(0),
+ m_tqlayout(0),
m_desktopLayoutOwner( NULL ),
m_shadowEngine(0),
m_contextMenu(0),
@@ -363,7 +363,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y)
if( y == -1 )
y = 0;
if( m_desktopLayoutOwner == NULL )
- { // must own manager selection before setting global desktop layout
+ { // must own manager selection before setting global desktop tqlayout
int screen = DefaultScreen( qt_xdisplay());
m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(),
screen, this );
@@ -397,10 +397,10 @@ void KMiniPager::resizeEvent(TQResizeEvent*)
if(deskNum == 0 || deskNum % rowNum != 0)
deskCols += 1;
- if (m_layout)
+ if (m_tqlayout)
{
- delete m_layout;
- m_layout = 0;
+ delete m_tqlayout;
+ m_tqlayout = 0;
}
int nDX, nDY;
@@ -418,7 +418,7 @@ void KMiniPager::resizeEvent(TQResizeEvent*)
}
// 1 pixel spacing.
- m_layout = new TQGridLayout(this, nDX, nDY, 0, 1);
+ m_tqlayout = new TQGridLayout(this, nDX, nDY, 0, 1);
TQValueList<KMiniPagerButton*>::Iterator it = m_desktops.begin();
TQValueList<KMiniPagerButton*>::Iterator itEnd = m_desktops.end();
@@ -427,14 +427,14 @@ void KMiniPager::resizeEvent(TQResizeEvent*)
while( it != itEnd ) {
c = 0;
while( (it != itEnd) && (c < nDY) ) {
- m_layout->addWidget( *it, r, c );
+ m_tqlayout->addWidget( *it, r, c );
++it;
++c;
}
++r;
}
- m_layout->activate();
+ m_tqlayout->activate();
updateGeometry();
}
@@ -865,7 +865,7 @@ void KMiniPager::slotDesktopNamesChanged()
{
TQString name = m_kwin->desktopName(i);
(*it)->setDesktopName(name);
- (*it)->repaint();
+ (*it)->tqrepaint();
TQToolTip::remove((*it));
TQToolTip::add((*it), name);
}
diff --git a/kicker/applets/minipager/pagerapplet.h b/kicker/applets/minipager/pagerapplet.h
index e72f44588..2a9f7f313 100644
--- a/kicker/applets/minipager/pagerapplet.h
+++ b/kicker/applets/minipager/pagerapplet.h
@@ -121,7 +121,7 @@ private:
TQButtonGroup *m_group;
- TQGridLayout *m_layout;
+ TQGridLayout *m_tqlayout;
bool m_useViewports;
int desktopLayoutOrientation;
int desktopLayoutX;
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index 10a5aa8c9..3d7f06985 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -106,7 +106,7 @@ TQRect KMiniPagerButton::mapGeometryToViewport(const KWin::WindowInfo& info) con
if (!m_useViewports)
return info.frameGeometry();
- // ### fix vertically layouted viewports
+ // ### fix vertically tqlayouted viewports
TQRect _r(info.frameGeometry());
TQPoint vx(m_pager->kwin()->currentViewport(m_pager->kwin()->currentDesktop()));
@@ -129,7 +129,7 @@ TQPoint KMiniPagerButton::mapPointToViewport(const TQPoint& _p) const
TQPoint vx(m_pager->kwin()->currentViewport(m_pager->kwin()->currentDesktop()));
- // ### fix vertically layouted viewports
+ // ### fix vertically tqlayouted viewports
TQPoint p(_p);
p.setX(p.x() + (m_desktop - vx.x()) * TQApplication::desktop()->width());
return p;
@@ -157,8 +157,8 @@ bool KMiniPagerButton::shouldPaintWindow( KWin::WindowInfo *info ) const
TQRect r = mapGeometryToViewport(*info);
if (!info->hasState(NET::Sticky) &&
- !TQApplication::desktop()->geometry().contains(r.topLeft()) &&
- !TQApplication::desktop()->geometry().contains(r.topRight()))
+ !TQApplication::desktop()->tqgeometry().tqcontains(r.topLeft()) &&
+ !TQApplication::desktop()->tqgeometry().tqcontains(r.topRight()))
return false;
}
@@ -404,16 +404,16 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
// transparent windows get an 1 pixel frame...
if (on)
{
- bp->setPen(colorGroup().midlight());
+ bp->setPen(tqcolorGroup().midlight());
}
else if (down)
{
- bp->setPen(KickerLib::blendColors(colorGroup().mid(),
- colorGroup().midlight()));
+ bp->setPen(KickerLib::blendColors(tqcolorGroup().mid(),
+ tqcolorGroup().midlight()));
}
else
{
- bp->setPen(colorGroup().dark());
+ bp->setPen(tqcolorGroup().dark());
}
bp->drawRect(0, 0, w, h);
@@ -424,16 +424,16 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
if (on)
{
- background = colorGroup().brush(TQColorGroup::Midlight);
+ background = tqcolorGroup().brush(TQColorGroup::Midlight);
}
else if (down)
{
- background = KickerLib::blendColors(colorGroup().mid(),
- colorGroup().midlight());
+ background = KickerLib::blendColors(tqcolorGroup().mid(),
+ tqcolorGroup().midlight());
}
else
{
- background = colorGroup().brush(TQColorGroup::Mid);
+ background = tqcolorGroup().brush(TQColorGroup::Mid);
}
bp->fillRect(0, 0, w, h, background);
@@ -462,12 +462,12 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
if (kwin->activeWindow() == info->win())
{
- TQBrush brush = colorGroup().brush(TQColorGroup::Highlight);
- qDrawShadeRect(bp, r, colorGroup(), false, 1, 0, &brush);
+ TQBrush brush = tqcolorGroup().brush(TQColorGroup::Highlight);
+ qDrawShadeRect(bp, r, tqcolorGroup(), false, 1, 0, &brush);
}
else
{
- TQBrush brush = colorGroup().brush(TQColorGroup::Button);
+ TQBrush brush = tqcolorGroup().brush(TQColorGroup::Button);
if (on)
{
@@ -475,7 +475,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
}
bp->fillRect(r, brush);
- qDrawShadeRect(bp, r, colorGroup(), true, 1, 0);
+ qDrawShadeRect(bp, r, tqcolorGroup(), true, 1, 0);
}
if (m_pager->windowIcons() && r.width() > 15 && r.height() > 15)
@@ -498,11 +498,11 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
// makes it look a bit more finished.
if (on)
{
- bp->setPen(colorGroup().midlight());
+ bp->setPen(tqcolorGroup().midlight());
}
else
{
- bp->setPen(colorGroup().mid());
+ bp->setPen(tqcolorGroup().mid());
}
bp->drawRect(0, 0, w, h);
@@ -515,7 +515,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
if (transparent || liveBkgnd)
{
- bp->setPen(on ? colorGroup().midlight() : colorGroup().buttonText());
+ bp->setPen(on ? tqcolorGroup().midlight() : tqcolorGroup().buttonText());
m_pager->shadowEngine()->drawText(*bp, TQRect(0, 0, w, h), AlignCenter, label, size());
}
else
@@ -523,7 +523,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
}
if (m_inside)
- KickerLib::drawBlendedRect(bp, TQRect(1, 1, width() - 2, height() - 2), colorGroup().foreground());
+ KickerLib::drawBlendedRect(bp, TQRect(1, 1, width() - 2, height() - 2), tqcolorGroup().foreground());
}
void KMiniPagerButton::mousePressEvent(TQMouseEvent * e)
@@ -578,7 +578,7 @@ void KMiniPagerButton::mouseMoveEvent(TQMouseEvent* e)
if (m_currentWindow && !m_pager->clickPos.isNull() &&
(m_pager->clickPos - e->pos()).manhattanLength() > KGlobalSettings::dndEventDelay())
{
- TQRect r = m_currentWindow->geometry();
+ TQRect r = m_currentWindow->tqgeometry();
// preview window height, window width
int ww = r.width() * w / dw;
@@ -586,9 +586,9 @@ void KMiniPagerButton::mouseMoveEvent(TQMouseEvent* e)
TQPixmap windowImage(ww, wh);
TQPainter bp(&windowImage, this);
- bp.setPen(colorGroup().foreground());
+ bp.setPen(tqcolorGroup().foreground());
bp.drawRect(0, 0, ww, wh);
- bp.fillRect(1, 1, ww - 2, wh - 2, colorGroup().background());
+ bp.fillRect(1, 1, ww - 2, wh - 2, tqcolorGroup().background());
Task::List tasklist;
tasklist.append(m_currentWindow);
diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp
index 44f2229ec..9033ff668 100644
--- a/kicker/applets/naughty/NaughtyApplet.cpp
+++ b/kicker/applets/naughty/NaughtyApplet.cpp
@@ -69,8 +69,8 @@ NaughtyApplet::NaughtyApplet
button_ = new SimpleButton(this);
button_->setFixedSize(20, 20);
- TQVBoxLayout * layout = new TQVBoxLayout(this);
- layout->addWidget(button_);
+ TQVBoxLayout * tqlayout = new TQVBoxLayout(this);
+ tqlayout->addWidget(button_);
monitor_ = new NaughtyProcessMonitor(2, 20, this);
@@ -105,7 +105,7 @@ NaughtyApplet::~NaughtyApplet()
void
NaughtyApplet::slotWarn(ulong pid, const TQString & name)
{
- if (ignoreList_.contains(name))
+ if (ignoreList_.tqcontains(name))
return;
TQString s = i18n("A program called '%1' is slowing down the others "
diff --git a/kicker/applets/naughty/NaughtyApplet.h b/kicker/applets/naughty/NaughtyApplet.h
index beb70552d..23bdf62c9 100644
--- a/kicker/applets/naughty/NaughtyApplet.h
+++ b/kicker/applets/naughty/NaughtyApplet.h
@@ -51,7 +51,7 @@ class NaughtyApplet : public KPanelApplet
signals:
- void layoutChanged();
+ void tqlayoutChanged();
protected slots:
diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.cpp b/kicker/applets/naughty/NaughtyProcessMonitor.cpp
index 6228cfba1..1acd64f09 100644
--- a/kicker/applets/naughty/NaughtyProcessMonitor.cpp
+++ b/kicker/applets/naughty/NaughtyProcessMonitor.cpp
@@ -164,7 +164,7 @@ NaughtyProcessMonitor::slotTimeout()
void
NaughtyProcessMonitor::_process(ulong pid, uint load)
{
- if (!d->loadMap_.contains(pid))
+ if (!d->loadMap_.tqcontains(pid))
{
d->loadMap_.insert(pid, load);
return;
@@ -172,12 +172,12 @@ NaughtyProcessMonitor::_process(ulong pid, uint load)
uint oldLoad = d->loadMap_[pid];
bool misbehaving = (load - oldLoad) > 40 * (d->interval_ / 1000);
- bool wasMisbehaving = d->scoreMap_.contains(pid);
+ bool wasMisbehaving = d->scoreMap_.tqcontains(pid);
if (misbehaving)
if (wasMisbehaving)
{
- d->scoreMap_.replace(pid, d->scoreMap_[pid] + 1);
+ d->scoreMap_.tqreplace(pid, d->scoreMap_[pid] + 1);
if (canKill(pid))
emit(runawayProcess(pid, processName(pid)));
}
@@ -187,7 +187,7 @@ NaughtyProcessMonitor::_process(ulong pid, uint load)
if (wasMisbehaving)
d->scoreMap_.remove(pid);
- d->loadMap_.replace(pid, load);
+ d->loadMap_.tqreplace(pid, load);
}
// Here begins the set of system-specific methods.
@@ -221,7 +221,7 @@ NaughtyProcessMonitor::canKill(ulong pid) const
return geteuid() == a;
#elif defined(__OpenBSD__)
// simply check if entry exists in the uid map and use it
- if (!d->uidMap_.contains(pid))
+ if (!d->uidMap_.tqcontains(pid))
return false ;
return geteuid () == d->uidMap_[pid] ;
@@ -255,7 +255,7 @@ NaughtyProcessMonitor::processName(ulong pid) const
}
// Now strip 'kdeinit:' prefix.
- TQString unicode(TQString::fromLocal8Bit(s));
+ TQString tqunicode(TQString::fromLocal8Bit(s));
#elif defined(__OpenBSD__)
int mib[4] ;
@@ -280,12 +280,12 @@ NaughtyProcessMonitor::processName(ulong pid) const
}
// Now strip 'kdeinit:' prefix.
- TQString unicode(TQString::fromLocal8Bit(argv[0]));
+ TQString tqunicode(TQString::fromLocal8Bit(argv[0]));
free (argv) ;
#endif
- TQStringList parts(TQStringList::split(' ', unicode));
+ TQStringList parts(TQStringList::split(' ', tqunicode));
TQString processName = parts[0] == "kdeinit:" ? parts[1] : parts[0];
@@ -449,7 +449,7 @@ NaughtyProcessMonitor::getLoad(ulong pid, uint & load) const
return true;
#elif defined(__OpenBSD__)
// use cache
- if (!d->cacheLoadMap_.contains(pid))
+ if (!d->cacheLoadMap_.tqcontains(pid))
return false ;
load = d->cacheLoadMap_[pid] ;
diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp
index 94f30f33a..cfab6d751 100644
--- a/kicker/applets/run/runapplet.cpp
+++ b/kicker/applets/run/runapplet.cpp
@@ -121,14 +121,14 @@ void RunApplet::resizeEvent(TQResizeEvent*)
_input->reparent(this, TQPoint(0,0), true);
_label->setGeometry(0,0, width(), _label->height());
- if(height() >= _input->sizeHint().height() + _label->height())
+ if(height() >= _input->tqsizeHint().height() + _label->height())
{
- int inputVOffset = height() - _input->sizeHint().height() - 2;
- int labelHeight = _label->sizeHint().height();
+ int inputVOffset = height() - _input->tqsizeHint().height() - 2;
+ int labelHeight = _label->tqsizeHint().height();
_label->setGeometry(0, inputVOffset - labelHeight,
width(), labelHeight);
_input->setGeometry(0, inputVOffset,
- width(), _input->sizeHint().height());
+ width(), _input->tqsizeHint().height());
_label->show();
}
else
@@ -138,7 +138,7 @@ void RunApplet::resizeEvent(TQResizeEvent*)
// make it as high as the combobox naturally wants to be
// but no taller than the panel is!
// don't forget to center it vertically either.
- int newHeight = _input->sizeHint().height();
+ int newHeight = _input->tqsizeHint().height();
if (newHeight > height())
newHeight = height();
_input->setGeometry(0, (height() - newHeight) / 2,
@@ -184,7 +184,7 @@ void RunApplet::setButtonText()
int RunApplet::widthForHeight(int ) const
{
- return _label->sizeHint().width();
+ return _label->tqsizeHint().width();
}
int RunApplet::heightForWidth(int ) const
diff --git a/kicker/applets/swallow/prefwidgetbase.ui b/kicker/applets/swallow/prefwidgetbase.ui
index bd2673efa..8fb2b4278 100644
--- a/kicker/applets/swallow/prefwidgetbase.ui
+++ b/kicker/applets/swallow/prefwidgetbase.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>PreferencesWidgetBase</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -110,7 +110,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -122,8 +122,8 @@
<includes>
<include location="local" impldecl="in implementation">kdialog.h</include>
</includes>
-<layoutdefaults spacing="3" margin="6"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="3" margin="6"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>keditlistbox.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp
index 7112c706a..cdc312bc5 100644
--- a/kicker/applets/swallow/swallow.cpp
+++ b/kicker/applets/swallow/swallow.cpp
@@ -76,8 +76,8 @@ SwallowApplet::SwallowApplet( const TQString& configFile,
TQBoxLayout::Direction d = (orientation() == Horizontal) ?
TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom;
- m_layout = new TQBoxLayout( this, d, 0, 2 ); // make stretch configurable?
- m_layout->setAutoAdd( false );
+ m_tqlayout = new TQBoxLayout( this, d, 0, 2 ); // make stretch configurable?
+ m_tqlayout->setAutoAdd( false );
// read the config file and start all the configured apps
createApps( readConfig() );
@@ -164,7 +164,7 @@ void SwallowApplet::createApps( SwallowCommandList* list )
kapp->processEvents();
}
- m_layout->activate();
+ m_tqlayout->activate();
}
@@ -189,7 +189,7 @@ void SwallowApplet::embedded( SwallowApp *app )
else
resize( width(), heightForWidth( width() ));
- m_layout->addWidget( app );
+ m_tqlayout->addWidget( app );
app->show();
updateGeometry();
emit updateLayout();
@@ -206,7 +206,7 @@ int SwallowApplet::widthForHeight(int he)
{
kdDebug() << "**** width for h: " << he << endl;
int w = embeddedList->isEmpty() ? 30 : 0;
- layoutApps();
+ tqlayoutApps();
SwallowAppListIterator it( *embeddedList );
while ( it.current() ) {
kdDebug() << "current: " << it.current()->width() << endl;
@@ -222,7 +222,7 @@ int SwallowApplet::widthForHeight(int he)
int SwallowApplet::heightForWidth(int)
{
int h = embeddedList->isEmpty() ? 30 : 0;
- layoutApps();
+ tqlayoutApps();
SwallowAppListIterator it( *embeddedList );
while ( it.current() ) {
h += (it.current())->height();
@@ -233,12 +233,12 @@ int SwallowApplet::heightForWidth(int)
return h;
}
-void SwallowApplet::layoutApps()
+void SwallowApplet::tqlayoutApps()
{
if ( KPanelApplet::orientation() == Horizontal )
- m_layout->setDirection( TQBoxLayout::LeftToRight );
+ m_tqlayout->setDirection( TQBoxLayout::LeftToRight );
else
- m_layout->setDirection( TQBoxLayout::TopToBottom );
+ m_tqlayout->setDirection( TQBoxLayout::TopToBottom );
}
@@ -286,7 +286,7 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent,
parseCommand(process, swc->cmdline);
// move window out of sight
- // *process << "-geometry";
+ // *process << "-tqgeometry";
// *process << TQString("32x32+%1+%2").arg(kapp->desktop()->width()).arg(kapp->desktop()->height());
connect(process, TQT_SIGNAL(processExited(KProcess*)),
@@ -320,7 +320,7 @@ void SwallowApp::windowAdded(WId win)
if (winTitle == names[0]) {
kdDebug()<< "embedding window with title: "<<winTitle.latin1() << endl;
- TQRect r = KWin::windowInfo(win).geometry();
+ TQRect r = KWin::windowInfo(win).tqgeometry();
int h = r.height();
if ( h == 0 ) h = 1;
wh_ratio = (float) r.width() / (float) h;
diff --git a/kicker/applets/swallow/swallow.h b/kicker/applets/swallow/swallow.h
index 437c3fa8b..4162ec0ba 100644
--- a/kicker/applets/swallow/swallow.h
+++ b/kicker/applets/swallow/swallow.h
@@ -70,7 +70,7 @@ private slots:
void embedded( SwallowApp * );
private:
- void layoutApps();
+ void tqlayoutApps();
SwallowCommandList* readConfig();
void createApps( SwallowCommandList * );
@@ -81,7 +81,7 @@ private:
static KWinModule *wModule;
SwallowCommandList * m_swcList;
- TQBoxLayout *m_layout;
+ TQBoxLayout *m_tqlayout;
};
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index ad44b640f..0850d6998 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -78,7 +78,7 @@ SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int ac
m_autoRetractTimer(0),
m_autoRetract(false),
m_iconSize(24),
- m_layout(0)
+ m_tqlayout(0)
{
DCOPObject::setObjId("SystemTrayApplet");
loadSettings();
@@ -112,7 +112,7 @@ void SystemTrayApplet::initialize()
if (existing)
{
updateVisibleWins();
- layoutTray();
+ tqlayoutTray();
}
// the KWinModule notifies us when tray windows are added or removed
@@ -190,7 +190,7 @@ bool SystemTrayApplet::x11Event( XEvent *e )
return true;
embedWindow( e->xclient.data.l[2], false );
updateVisibleWins();
- layoutTray();
+ tqlayoutTray();
return true;
}
}
@@ -288,7 +288,7 @@ void SystemTrayApplet::applySettings()
item;
item = item->next())
{
- if( windowNameToClass.contains(item->text()))
+ if( windowNameToClass.tqcontains(item->text()))
m_sortOrderIconList.append(windowNameToClass[item->text()]);
else
m_sortOrderIconList.append(item->text());
@@ -301,7 +301,7 @@ void SystemTrayApplet::applySettings()
item;
item = item->next())
{
- if( windowNameToClass.contains(item->text()))
+ if( windowNameToClass.tqcontains(item->text()))
m_hiddenIconList.append(windowNameToClass[item->text()]);
else
m_hiddenIconList.append(item->text());
@@ -340,7 +340,7 @@ void SystemTrayApplet::applySettings()
showExpandButton(!m_hiddenWins.isEmpty());
updateVisibleWins();
- layoutTray();
+ tqlayoutTray();
}
void SystemTrayApplet::checkAutoRetract()
@@ -350,7 +350,7 @@ void SystemTrayApplet::checkAutoRetract()
return;
}
- if (!geometry().contains(mapFromGlobal(TQCursor::pos())))
+ if (!tqgeometry().tqcontains(mapFromGlobal(TQCursor::pos())))
{
m_autoRetractTimer->stop();
if (m_autoRetract)
@@ -389,12 +389,12 @@ void SystemTrayApplet::showExpandButton(bool show)
if (orientation() == Vertical)
{
m_expandButton->setFixedSize(width() - 4,
- m_expandButton->sizeHint()
+ m_expandButton->tqsizeHint()
.height());
}
else
{
- m_expandButton->setFixedSize(m_expandButton->sizeHint()
+ m_expandButton->setFixedSize(m_expandButton->tqsizeHint()
.width(),
height() - 4);
}
@@ -426,7 +426,7 @@ void SystemTrayApplet::orientationChange( Orientation /*orientation*/ )
void SystemTrayApplet::iconSizeChanged() {
loadSettings();
updateVisibleWins();
- layoutTray();
+ tqlayoutTray();
TrayEmbedList::iterator emb = m_shownWins.begin();
while (emb != m_shownWins.end()) {
@@ -477,7 +477,7 @@ void SystemTrayApplet::systemTrayWindowAdded( WId w )
embedWindow(w, true);
updateVisibleWins();
- layoutTray();
+ tqlayoutTray();
if (m_showFrame && frameStyle() == NoFrame)
{
@@ -642,7 +642,7 @@ void SystemTrayApplet::expand()
refreshExpandButton();
updateVisibleWins();
- layoutTray();
+ tqlayoutTray();
if (m_autoRetractTimer)
{
@@ -661,7 +661,7 @@ void SystemTrayApplet::retract()
refreshExpandButton();
updateVisibleWins();
- layoutTray();
+ tqlayoutTray();
}
void SystemTrayApplet::updateTrayWindows()
@@ -672,7 +672,7 @@ void SystemTrayApplet::updateTrayWindows()
WId wid = (*emb)->embeddedWinId();
if ((wid == 0) ||
((*emb)->kdeTray() &&
- !kwin_module->systemTrayWindows().contains(wid)))
+ !kwin_module->systemTrayWindows().tqcontains(wid)))
{
(*emb)->deleteLater();
emb = m_shownWins.erase(emb);
@@ -689,7 +689,7 @@ void SystemTrayApplet::updateTrayWindows()
WId wid = (*emb)->embeddedWinId();
if ((wid == 0) ||
((*emb)->kdeTray() &&
- !kwin_module->systemTrayWindows().contains(wid)))
+ !kwin_module->systemTrayWindows().tqcontains(wid)))
{
(*emb)->deleteLater();
emb = m_hiddenWins.erase(emb);
@@ -702,7 +702,7 @@ void SystemTrayApplet::updateTrayWindows()
showExpandButton(!m_hiddenWins.isEmpty());
updateVisibleWins();
- layoutTray();
+ tqlayoutTray();
}
int SystemTrayApplet::maxIconWidth() const
@@ -830,7 +830,7 @@ int SystemTrayApplet::widthForHeight(int h) const
me->setFixedHeight(h);
}
- return sizeHint().width();
+ return tqsizeHint().width();
}
int SystemTrayApplet::heightForWidth(int w) const
@@ -849,7 +849,7 @@ int SystemTrayApplet::heightForWidth(int w) const
me->setFixedWidth(w);
}
- return sizeHint().height();
+ return tqsizeHint().height();
}
void SystemTrayApplet::moveEvent( TQMoveEvent* )
@@ -860,12 +860,12 @@ void SystemTrayApplet::moveEvent( TQMoveEvent* )
void SystemTrayApplet::resizeEvent( TQResizeEvent* )
{
- layoutTray();
+ tqlayoutTray();
// we need to give ourselves a chance to adjust our size before calling this
TQTimer::singleShot(0, this, TQT_SIGNAL(updateLayout()));
}
-void SystemTrayApplet::layoutTray()
+void SystemTrayApplet::tqlayoutTray()
{
setUpdatesEnabled(false);
@@ -881,18 +881,18 @@ void SystemTrayApplet::layoutTray()
* line = what line to draw an icon in */
int i = 0, line, nbrOfLines, heightWidth;
bool showExpandButton = m_expandButton && m_expandButton->isVisibleTo(this);
- delete m_layout;
- m_layout = new TQGridLayout(this, 1, 1, ICON_MARGIN, ICON_MARGIN);
+ delete m_tqlayout;
+ m_tqlayout = new TQGridLayout(this, 1, 1, ICON_MARGIN, ICON_MARGIN);
if (m_expandButton)
{
if (orientation() == Vertical)
{
- m_expandButton->setFixedSize(width() - 4, m_expandButton->sizeHint().height());
+ m_expandButton->setFixedSize(width() - 4, m_expandButton->tqsizeHint().height());
}
else
{
- m_expandButton->setFixedSize(m_expandButton->sizeHint().width(), height() - 4);
+ m_expandButton->setFixedSize(m_expandButton->tqsizeHint().width(), height() - 4);
}
}
@@ -901,18 +901,18 @@ void SystemTrayApplet::layoutTray()
int col = 0;
//
- // The margin and spacing specified in the layout implies that:
+ // The margin and spacing specified in the tqlayout implies that:
// [-- ICON_MARGIN pixels --] [-- first icon --] [-- ICON_MARGIN pixels --] ... [-- ICON_MARGIN pixels --] [-- last icon --] [-- ICON_MARGIN pixels --]
//
// So, if we say that iconWidth is the icon width plus the ICON_MARGIN pixels spacing, then the available width for the icons
- // is the widget width minus ICON_MARGIN pixels margin. Forgetting these ICON_MARGIN pixels broke the layout algorithm in KDE <= 3.5.9.
+ // is the widget width minus ICON_MARGIN pixels margin. Forgetting these ICON_MARGIN pixels broke the tqlayout algorithm in KDE <= 3.5.9.
//
// This fix makes the workarounds in the heightForWidth() and widthForHeight() methods unneeded.
//
if (orientation() == Vertical)
{
- int iconWidth = maxIconWidth() + ICON_MARGIN; // +2 for the margins that implied by the layout
+ int iconWidth = maxIconWidth() + ICON_MARGIN; // +2 for the margins that implied by the tqlayout
heightWidth = width() - ICON_MARGIN;
// to avoid nbrOfLines=0 we ensure heightWidth >= iconWidth!
heightWidth = heightWidth < iconWidth ? iconWidth : heightWidth;
@@ -920,7 +920,7 @@ void SystemTrayApplet::layoutTray()
if (showExpandButton)
{
- m_layout->addMultiCellWidget(m_expandButton,
+ m_tqlayout->addMultiCellWidget(m_expandButton,
0, 0,
0, nbrOfLines - 1,
Qt::AlignHCenter | Qt::AlignVCenter);
@@ -935,7 +935,7 @@ void SystemTrayApplet::layoutTray()
{
line = i % nbrOfLines;
(*emb)->show();
- m_layout->addWidget((*emb), col, line,
+ m_tqlayout->addWidget((*emb), col, line,
Qt::AlignHCenter | Qt::AlignVCenter);
if ((line + 1) == nbrOfLines)
@@ -953,7 +953,7 @@ void SystemTrayApplet::layoutTray()
{
line = i % nbrOfLines;
(*emb)->show();
- m_layout->addWidget((*emb), col, line,
+ m_tqlayout->addWidget((*emb), col, line,
Qt::AlignHCenter | Qt::AlignVCenter);
if ((line + 1) == nbrOfLines)
@@ -966,14 +966,14 @@ void SystemTrayApplet::layoutTray()
}
else // horizontal
{
- int iconHeight = maxIconHeight() + ICON_MARGIN; // +2 for the margins that implied by the layout
+ int iconHeight = maxIconHeight() + ICON_MARGIN; // +2 for the margins that implied by the tqlayout
heightWidth = height() - ICON_MARGIN;
heightWidth = heightWidth < iconHeight ? iconHeight : heightWidth; // to avoid nbrOfLines=0
nbrOfLines = heightWidth / iconHeight;
if (showExpandButton)
{
- m_layout->addMultiCellWidget(m_expandButton,
+ m_tqlayout->addMultiCellWidget(m_expandButton,
0, nbrOfLines - 1,
0, 0,
Qt::AlignHCenter | Qt::AlignVCenter);
@@ -987,7 +987,7 @@ void SystemTrayApplet::layoutTray()
{
line = i % nbrOfLines;
(*emb)->show();
- m_layout->addWidget((*emb), line, col,
+ m_tqlayout->addWidget((*emb), line, col,
Qt::AlignHCenter | Qt::AlignVCenter);
if ((line + 1) == nbrOfLines)
@@ -1005,7 +1005,7 @@ void SystemTrayApplet::layoutTray()
{
line = i % nbrOfLines;
(*emb)->show();
- m_layout->addWidget((*emb), line, col,
+ m_tqlayout->addWidget((*emb), line, col,
Qt::AlignHCenter | Qt::AlignVCenter);
if ((line + 1) == nbrOfLines)
@@ -1051,7 +1051,7 @@ TrayEmbed::TrayEmbed( bool kdeTray, TQWidget* parent )
void TrayEmbed::getIconSize(int defaultIconSize)
{
- TQSize minSize = minimumSizeHint();
+ TQSize minSize = tqminimumSizeHint();
int width = minSize.width();
int height = minSize.height();
@@ -1067,12 +1067,12 @@ void TrayEmbed::getIconSize(int defaultIconSize)
void TrayEmbed::setBackground()
{
- const TQPixmap *pbg = parentWidget()->backgroundPixmap();
+ const TQPixmap *pbg = tqparentWidget()->backgroundPixmap();
if (pbg)
{
TQPixmap bg(width(), height());
- bg.fill(parentWidget(), pos());
+ bg.fill(tqparentWidget(), pos());
setPaletteBackgroundPixmap(bg);
setBackgroundOrigin(WidgetOrigin);
}
diff --git a/kicker/applets/systemtray/systemtrayapplet.desktop b/kicker/applets/systemtray/systemtrayapplet.desktop
index ab737d83c..d054f9a4c 100644
--- a/kicker/applets/systemtray/systemtrayapplet.desktop
+++ b/kicker/applets/systemtray/systemtrayapplet.desktop
@@ -12,7 +12,7 @@ Name[ca]=Safata del sistema
Name[cs]=Systémová část panelu
Name[csb]=Systemòwi zabiérnik
Name[cy]=Bar Tasgau
-Name[da]=Statusfelt
+Name[da]=tqStatusfelt
Name[de]=Systemabschnitt der Kontrollleiste
Name[el]=Πλαίσιο συστήματος
Name[eo]=Sistempleto
@@ -92,7 +92,7 @@ Comment[ca]=L'applet per al plafó de la safata del sistema
Comment[cs]=Systémová část panelu určená pro applety
Comment[csb]=Aplet systemòwégò zabiérnika dlô panelu
Comment[cy]=Rhaglennig bar tasgau i'r panel
-Comment[da]=Statusfelt-panelprogrammet
+Comment[da]=tqStatusfelt-panelprogrammet
Comment[de]=Systemabschnitt der Kontrollleiste
Comment[el]=Μικροεφαρμογή του πίνακα για το πλαίσιο συστήματος
Comment[eo]=La sistempleta panelaplikaĵeto
diff --git a/kicker/applets/systemtray/systemtrayapplet.h b/kicker/applets/systemtray/systemtrayapplet.h
index f66e0caa5..d74c2ccf7 100644
--- a/kicker/applets/systemtray/systemtrayapplet.h
+++ b/kicker/applets/systemtray/systemtrayapplet.h
@@ -76,7 +76,7 @@ protected slots:
void initialize();
void systemTrayWindowAdded( WId );
void updateTrayWindows();
- void layoutTray();
+ void tqlayoutTray();
void paletteChange(const TQPalette & /* oldPalette */);
void toggleExpanded();
void settingsDialogFinished();
@@ -110,7 +110,7 @@ private:
TQTimer* m_autoRetractTimer;
bool m_autoRetract;
int m_iconSize;
- TQGridLayout* m_layout;
+ TQGridLayout* m_tqlayout;
};
class TrayEmbed : public QXEmbed
diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp
index 55e5d113f..a8a952962 100644
--- a/kicker/applets/taskbar/taskbarapplet.cpp
+++ b/kicker/applets/taskbar/taskbarapplet.cpp
@@ -56,11 +56,11 @@ TaskbarApplet::TaskbarApplet( const TQString& configFile, Type type, int actions
: KPanelApplet( configFile, type, actions, parent, name )
{
setBackgroundOrigin( AncestorOrigin );
- TQHBoxLayout* layout = new TQHBoxLayout( this );
+ TQHBoxLayout* tqlayout = new TQHBoxLayout( this );
container = new TaskBarContainer( false, this );
container->setBackgroundOrigin( AncestorOrigin );
connect(container, TQT_SIGNAL(containerCountChanged()), this, TQT_SIGNAL(updateLayout()));
- layout->addWidget( container, 1 );
+ tqlayout->addWidget( container, 1 );
container->popupDirectionChange(popupDirection());
}
@@ -82,7 +82,7 @@ int TaskbarApplet::widthForHeight(int h) const
KPanelExtension::Position d = orientation() == Qt::Horizontal ?
KPanelExtension::Top :
KPanelExtension::Left;
- return container->sizeHint(d, TQSize(200, h)).width();
+ return container->tqsizeHint(d, TQSize(200, h)).width();
}
int TaskbarApplet::heightForWidth(int w) const
@@ -97,7 +97,7 @@ int TaskbarApplet::heightForWidth(int w) const
KPanelExtension::Position d = orientation() == Qt::Horizontal ?
KPanelExtension::Top :
KPanelExtension::Left;
- return container->sizeHint(d, TQSize(w, 200)).height();
+ return container->tqsizeHint(d, TQSize(w, 200)).height();
}
void TaskbarApplet::preferences()