diff options
Diffstat (limited to 'kicker')
170 files changed, 1280 insertions, 1280 deletions
diff --git a/kicker/ChangeLog b/kicker/ChangeLog index 6ba662f7e..dedec11d6 100644 --- a/kicker/ChangeLog +++ b/kicker/ChangeLog @@ -1,13 +1,13 @@ 2004-06-10 Dan Bullok <dan.kde@bullok.com> - * Fixed Bug 42278 - Strange layout with Kicker and custom size. Now buttons are never wider (for horizontal) or taller (for vertical) than 58 pixels. + * Fixed Bug 42278 - Strange tqlayout with Kicker and custom size. Now buttons are never wider (for horizontal) or taller (for vertical) than 58 pixels. * Added some symbolic constants for some kicker values (max size, min size, default custom size), that were previously hard-coded in a few places. 2002-01-03 John Firebaugh <jfirebaugh@kde.org> * Use mouse polling instead of enter/leave events to trigger auto-unhiding. Much more reliable and will allow us to do things like only unhide at the corners or when the mouse hits the edge of the screen with a certain velocity. Also fixes #27660. - * New class core/panelmanager.cpp. For now, just has code for auto-hide, but will soon handle the screen layout of the panels. + * New class core/panelmanager.cpp. For now, just has code for auto-hide, but will soon handle the screen tqlayout of the panels. 2002-01-02 John Firebaugh <jfirebaugh@kde.org> - * Now you can set the alignment by dnd. + * Now you can set the tqalignment by dnd. 2002-01-01 John Firebaugh <jfirebaugh@kde.org> * Make the action taken for each mouse button on a task container configurable. * Add Task::lower() method. diff --git a/kicker/TODO b/kicker/TODO index cf43fa146..2ef26260f 100644 --- a/kicker/TODO +++ b/kicker/TODO @@ -7,7 +7,7 @@ Issues Of Import Layout management autoexpending panels on the same side of the screen need to stop expanding at the point they run into each other. - make autohiding panels respect layout geometry too? e.g. don't overlap + make autohiding panels respect tqlayout tqgeometry too? e.g. don't overlap autounhiding panels should not obscure other panels ContainerArea completness doesn't autoscroll when moving a container @@ -45,7 +45,7 @@ libkicker poor name =/ shouldn't be so menu-centric either Optimize! - hiding: it seems there are more geometry calls made than really needed + hiding: it seems there are more tqgeometry calls made than really needed get rid of movies (which nobody really uses) in PanelButton Code clean ups remove pseudo transparency in favour of composite @@ -89,7 +89,7 @@ Unnasigned ++++ Floating panels **** When a panel is set to "floating" the following entries are added to the [General] config group: - FloatingPosition <-- geometry.topLeft(); + FloatingPosition <-- tqgeometry.topLeft(); FloatingOrientation <-- horizontal or vertical ++++ Drag and drop enhancements @@ -100,8 +100,8 @@ Unnasigned There are many DnD reports on bugs.kde.org which can provide further inspiration. -++++ Systray icon layout -**** The systray applet does a very basic homebrew layout of the icons +++++ Systray icon tqlayout +**** The systray applet does a very basic homebrew tqlayout of the icons that currently has several flawed assumptions that break when used with certain applications. These assumptions include that all icons in a given row will be approximately the same width and that things 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() diff --git a/kicker/data/kickoff/kmenu_vertical.mng b/kicker/data/kickoff/kmenu_vertical.mng Binary files differindex 7f7047d11..69eb7c99e 100644 --- a/kicker/data/kickoff/kmenu_vertical.mng +++ b/kicker/data/kickoff/kmenu_vertical.mng diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index d3b625f80..5ebce58c4 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/kicker/extensions/dockbar/dockbarextension.cpp @@ -60,7 +60,7 @@ DockBarExtension::DockBarExtension(const TQString& configFile, Type type, kwin_module = new KWinModule(this); connect( kwin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) ); setMinimumSize(DockContainer::sz(), DockContainer::sz()); - setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); loadContainerConfig(); } @@ -77,7 +77,7 @@ DockBarExtension::~DockBarExtension() if (dragging_container) delete dragging_container; } -TQSize DockBarExtension::sizeHint(Position p, TQSize) const +TQSize DockBarExtension::tqsizeHint(Position p, TQSize) const { if (p == Left || p == Right) return TQSize(DockContainer::sz(), DockContainer::sz() * containers.count()); @@ -87,7 +87,7 @@ TQSize DockBarExtension::sizeHint(Position p, TQSize) const void DockBarExtension::resizeEvent(TQResizeEvent*) { - layoutContainers(); + tqlayoutContainers(); } @@ -167,7 +167,7 @@ void DockBarExtension::windowAdded(WId win) saveContainerConfig(); } -void DockBarExtension::layoutContainers() +void DockBarExtension::tqlayoutContainers() { int i = 0; for (DockContainer::Vector::const_iterator it = containers.constBegin(); @@ -212,7 +212,7 @@ void DockBarExtension::embedWindow(WId win, TQString command, TQString resName, } container->embed(win); - layoutContainers(); + tqlayoutContainers(); emit updateLayout(); if (ncmd) container->askNewCommand(); @@ -246,7 +246,7 @@ void DockBarExtension::addContainer(DockContainer* c, int pos) void DockBarExtension::removeContainer(DockContainer* c) { - DockContainer::Vector::iterator it = qFind(containers.begin(), containers.end(), c); + DockContainer::Vector::iterator it = tqFind(containers.begin(), containers.end(), c); if (it == containers.end()) { @@ -255,7 +255,7 @@ void DockBarExtension::removeContainer(DockContainer* c) containers.erase(it); delete c; - layoutContainers(); + tqlayoutContainers(); } void DockBarExtension::embeddedWindowDestroyed(DockContainer* c) @@ -335,7 +335,7 @@ int DockBarExtension::findContainerAtPoint(const TQPoint& p) it != containers.constEnd(); ++it, ++i) { - if ((*it)->geometry().contains(p)) + if ((*it)->tqgeometry().tqcontains(p)) { return i; } @@ -360,7 +360,7 @@ void DockBarExtension::mouseReleaseEvent(TQMouseEvent *e ) { releaseMouse(); original_container->embed(dragging_container->embeddedWinId()); delete dragging_container; dragging_container = 0; - layoutContainers(); + tqlayoutContainers(); saveContainerConfig(); } } @@ -387,7 +387,7 @@ void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) { if (dragging_container) { dragging_container->move(e->globalPos() - mclic_dock_pos); - // change layout of other containers + // change tqlayout of other containers TQPoint dragpos(dragging_container->pos()), barpos(mapToGlobal(pos())); int pdrag1,pdrag2,psz; @@ -403,7 +403,7 @@ void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) { pdrag1 = dragged_container_original_pos; - DockContainer::Vector::iterator it = qFind(containers.begin(), containers.end(), original_container); + DockContainer::Vector::iterator it = tqFind(containers.begin(), containers.end(), original_container); if (it == containers.end()) { @@ -418,6 +418,6 @@ void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) { containers.erase(it); containers.insert(target, original_container); - layoutContainers(); + tqlayoutContainers(); } } diff --git a/kicker/extensions/dockbar/dockbarextension.h b/kicker/extensions/dockbar/dockbarextension.h index e735ec708..5c0263586 100644 --- a/kicker/extensions/dockbar/dockbarextension.h +++ b/kicker/extensions/dockbar/dockbarextension.h @@ -40,7 +40,7 @@ public: virtual ~DockBarExtension(); - TQSize sizeHint(Position, TQSize maxSize) const; + TQSize tqsizeHint(Position, TQSize maxSize) const; Position preferedPosition() const { return Right; } protected slots: @@ -55,7 +55,7 @@ protected: void removeContainer(DockContainer*); void saveContainerConfig(); void loadContainerConfig(); - void layoutContainers(); + void tqlayoutContainers(); int findContainerAtPoint(const TQPoint&); void mousePressEvent(TQMouseEvent *); void mouseReleaseEvent(TQMouseEvent *); diff --git a/kicker/extensions/kasbar/ChangeLog b/kicker/extensions/kasbar/ChangeLog index 09408fc4a..ce43d0ba1 100644 --- a/kicker/extensions/kasbar/ChangeLog +++ b/kicker/extensions/kasbar/ChangeLog @@ -26,7 +26,7 @@ - Improved the about dialog. - - Made masking of the containing toplevel optional. + - Made tqmasking of the containing toplevel optional. - Fixed positioning of the clock display in small mode. @@ -149,7 +149,7 @@ 2004-09-03 Friday 22:32 rich * - Added support for the XShape extension, the unused space is now - masked so that when you have a non-rectangular bar (by using + tqmasked so that when you have a non-rectangular bar (by using the 'Boxes per line' setting) the unused space is truly unused. To make this better, I need to make it so that the box is always populated from the screen edge outwards. @@ -164,7 +164,7 @@ - Added a context menu item to attach and detach the bar. - - Improved repaint performance. + - Improved tqrepaint performance. - Increased version number. @@ -211,7 +211,7 @@ * - Improved the handling of inactive desktop grouping. - Fixed a problem with popups not being deleted when their - associated item was invalidated. + associated item was tqinvalidated. 2004-08-07 Saturday 03:00 rich @@ -436,7 +436,7 @@ 2003-10-23 Thursday 21:41 bwalter - * Use topLevelWidget() instead of parent()->parent()... + * Use tqtopLevelWidget() instead of parent()->parent()... 2003-10-22 Wednesday 22:15 bwalter @@ -481,11 +481,11 @@ 2003-09-30 Tuesday 22:25 rich - * - More improvements to bg repainting (much more efficient). + * - More improvements to bg tqrepainting (much more efficient). - Fixed startup animation problem #39582 - - Fixed erase problem introduced by the repaint changes in my + - Fixed erase problem introduced by the tqrepaint changes in my last commit. CCMAIL: 39582-done@bugs.kde.org @@ -498,7 +498,7 @@ - Removed redundant reload of configuration info. - Reworked painting - Double buffering is now handled by KasBar - not the items. - Items now longer force an immediate repaint, + not the items. - Items now longer force an immediate tqrepaint, they use update instead. - Fixes #53735 CCMAIL: 53735-done@bugs.kde.org @@ -531,7 +531,7 @@ 2003-03-29 Saturday 20:29 binner - * Fixed a layout problem and solution for "only drawing last icon + * Fixed a tqlayout problem and solution for "only drawing last icon from a group". 2003-02-09 Sunday 09:51 mfranz @@ -608,7 +608,7 @@ 2002-08-09 Friday 23:57 rich - * - Fixed repaint problem with startup items + * - Fixed tqrepaint problem with startup items 2002-07-29 Monday 22:03 coolo @@ -743,11 +743,11 @@ 2001-07-17 Tuesday 19:59 rich * Added some extra guards around KRootPixmap calls and readded the - repaint I removed earlier + tqrepaint I removed earlier 2001-07-17 Tuesday 17:03 rich - * Remove redundant repaint + * Remove redundant tqrepaint 2001-07-17 Tuesday 16:47 rich @@ -818,7 +818,7 @@ 2001-05-14 Monday 00:40 rich * Added new about dialog Fixed some flicker problems Improved - thumbnail heuristics Improved transparent mode repaints + thumbnail heuristics Improved transparent mode tqrepaints 2001-04-27 Friday 19:07 rich @@ -916,7 +916,7 @@ 2001-03-06 Tuesday 12:32 faure - * ran includemocs to get this to compile (am_edit was trying to + * ran includetqmocs to get this to compile (am_edit was trying to compile a .moc.cpp into a .moc ... there's still something fishy in am_edit...) @@ -929,7 +929,7 @@ 2000-12-17 Sunday 12:00 elter - * Fixed totally broken kasbar sizeHint. + * Fixed totally broken kasbar tqsizeHint. 2000-12-17 Sunday 11:53 elter diff --git a/kicker/extensions/kasbar/DESIGN b/kicker/extensions/kasbar/DESIGN index 6d2de25e6..c107a4cb6 100644 --- a/kicker/extensions/kasbar/DESIGN +++ b/kicker/extensions/kasbar/DESIGN @@ -13,7 +13,7 @@ The division of labour between the classes is like this: * KasBar, KasItem, KasPopup These classes implement the KasBar widget. KasBar provides the - layout and smart redraws while the KasItem class is an abstract + tqlayout and smart redraws while the KasItem class is an abstract interface for the items forming the bars contents. The KasPopup class provides a self positioning widget that should be subclassed to provide useful information. diff --git a/kicker/extensions/kasbar/Doxyfile b/kicker/extensions/kasbar/Doxyfile index 8c82cae8b..f0db9df8b 100644 --- a/kicker/extensions/kasbar/Doxyfile +++ b/kicker/extensions/kasbar/Doxyfile @@ -227,7 +227,7 @@ SORT_MEMBER_DOCS = YES DISTRIBUTE_GROUP_DOC = NO # The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. +# Doxygen uses this value to tqreplace tabs by spaces in code fragments. TAB_SIZE = 8 @@ -329,7 +329,7 @@ WARN_IF_DOC_ERROR = YES # The WARN_FORMAT tag determines the format of the warning messages that # doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the +# tags, which will be tqreplaced by the file and line number from which the # warning originated and the warning text. WARN_FORMAT = "$file:$line: $text" @@ -351,7 +351,7 @@ WARN_LOGFILE = INPUT = . ../../taskmanager -# If the value of the INPUT tag contains directories, you can use the +# If the value of the INPUT tag tqcontains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp # and *.h) to filter out the source-files in the directories. If left # blank the following patterns are tested: @@ -370,14 +370,14 @@ RECURSIVE = NO # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = *moc* +EXCLUDE = *tqmoc* # The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories # that are symbolic links (a Unix filesystem feature) are excluded from the input. EXCLUDE_SYMLINKS = NO -# If the value of the INPUT tag contains directories, you can use the +# If the value of the INPUT tag tqcontains directories, you can use the # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude # certain files from those directories. @@ -389,7 +389,7 @@ EXCLUDE_PATTERNS = EXAMPLE_PATH = -# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# If the value of the EXAMPLE_PATH tag tqcontains directories, you can use the # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp # and *.h) to filter out the source-files in the directories. If left # blank all files are included. @@ -468,7 +468,7 @@ VERBATIM_HEADERS = YES # If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index # of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. +# tqcontains a lot of classes, structs, unions or interfaces. ALPHABETICAL_INDEX = NO @@ -704,7 +704,7 @@ RTF_HYPERLINKS = NO # Load stylesheet definitions from file. Syntax is similar to doxygen's # config file, i.e. a series of assigments. You only have to provide -# replacements, missing definitions are set to their default value. +# tqreplacements, missing definitions are set to their default value. RTF_STYLESHEET_FILE = diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp index bf2b64ba3..4175f01b7 100644 --- a/kicker/extensions/kasbar/kasbar.cpp +++ b/kicker/extensions/kasbar/kasbar.cpp @@ -93,7 +93,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f ) rootPix( 0 ), enableTint_( false ), tintAmount_( 0.1 ), - tintColour_( colorGroup().mid() ), + tintColour_( tqcolorGroup().mid() ), useMask_( true ), res(0) { @@ -102,7 +102,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f ) setMouseTracking( true ); setMaxBoxes( 0 ); - connect( this, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) ); + connect( this, TQT_SIGNAL( configChanged() ), TQT_SLOT( tqrepaint() ) ); } KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *name, WFlags f ) @@ -122,7 +122,7 @@ KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *nam rootPix( 0 ), enableTint_( false ), tintAmount_( 0.1 ), - tintColour_( colorGroup().mid() ), + tintColour_( tqcolorGroup().mid() ), useMask_( true ), res(0) { @@ -130,7 +130,7 @@ KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *nam items.setAutoDelete( true ); setMouseTracking( true ); setMaxBoxes( 0 ); - connect( master_, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) ); + connect( master_, TQT_SIGNAL( configChanged() ), TQT_SLOT( tqrepaint() ) ); } KasBar::~KasBar() @@ -255,7 +255,7 @@ void KasBar::setTint( bool enable ) } emit configChanged(); - repaint( true ); + tqrepaint( true ); } } @@ -269,7 +269,7 @@ void KasBar::setTint( double amount, TQColor color ) emit configChanged(); if ( rootPix->isAvailable() ) - rootPix->repaint( true ); + rootPix->tqrepaint( true ); } } @@ -375,7 +375,7 @@ void KasBar::setDetached( bool detach ) emit detachedChanged( detached ); } -TQSize KasBar::sizeHint( Orientation o, TQSize sz ) +TQSize KasBar::tqsizeHint( Orientation o, TQSize sz ) { if ( o == Horizontal ) setBoxesPerLine( sz.width() / itemExtent() ); @@ -416,7 +416,7 @@ void KasBar::updateLayout() bool updates = isUpdatesEnabled(); setUpdatesEnabled( false ); -// This is for testing a rectangular layout +// This is for testing a rectangular tqlayout // boxesPerLine_ = (uint) ceil(sqrt( items.count() )); // Work out the number of rows and columns @@ -445,8 +445,8 @@ void KasBar::updateLayout() setUpdatesEnabled( updates ); - TQWidget *top = topLevelWidget(); - TQRegion mask; + TQWidget *top = tqtopLevelWidget(); + TQRegion tqmask; KasItem *i; if ( orient == Horizontal ) { @@ -458,7 +458,7 @@ void KasBar::updateLayout() i->setPos( x, (items.at() / c) * itemExtent() ); i->update(); - mask = mask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) ); + tqmask = tqmask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) ); } } else { @@ -470,12 +470,12 @@ void KasBar::updateLayout() i->setPos( (items.at() % r) * itemExtent(), y ); i->update(); - mask = mask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) ); + tqmask = tqmask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) ); } } if ( useMask_ ) - top->setMask( mask ); + top->setMask( tqmask ); else top->clearMask(); update(); @@ -622,7 +622,7 @@ void KasBar::resizeEvent(TQResizeEvent *ev) TQPainter p( &offscreen ); paintBackground( &p, TQRect(TQPoint(0,0),size()) ); TQWidget::resizeEvent(ev); - emit layoutChanged(); + emit tqlayoutChanged(); } @@ -646,7 +646,7 @@ void KasBar::updateItem( KasItem *i ) update( TQRect( pos, TQSize( itemExtent(), itemExtent() ) ) ); } -void KasBar::repaintItem(KasItem *i, bool erase ) +void KasBar::tqrepaintItem(KasItem *i, bool erase ) { if ( !i ) return; @@ -658,7 +658,7 @@ void KasBar::repaintItem(KasItem *i, bool erase ) paintBackground( &p, TQRect( pos, TQSize( itemExtent(), itemExtent() ) ) ); i->paint( &p, pos.x(), pos.y() ); - repaint( TQRect( pos, TQSize( itemExtent(), itemExtent() ) ), transparent_ || erase ); + tqrepaint( TQRect( pos, TQSize( itemExtent(), itemExtent() ) ), transparent_ || erase ); } KasItem* KasBar::itemAt(const TQPoint &p) @@ -670,7 +670,7 @@ KasItem* KasBar::itemAt(const TQPoint &p) cr.setTopLeft( i->pos() ); cr.setSize( TQSize( itemExtent(), itemExtent() ) ); - if(cr.contains(p)) + if(cr.tqcontains(p)) return i; } @@ -687,12 +687,12 @@ void KasBar::setBackground( const TQPixmap &newBg ) updateLayout(); } -void KasBar::setMasked( bool mask ) +void KasBar::setMasked( bool tqmask ) { - if ( useMask_ == mask ) + if ( useMask_ == tqmask ) return; - useMask_ = mask; + useMask_ = tqmask; } void KasBar::setPaintInactiveFrames( bool enable ) diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h index 8ff745475..4cd10dc7c 100644 --- a/kicker/extensions/kasbar/kasbar.h +++ b/kicker/extensions/kasbar/kasbar.h @@ -84,7 +84,7 @@ class KDE_EXPORT KasBar : public QWidget Q_PROPERTY( uint boxesPerLine READ boxesPerLine ) Q_PROPERTY( Direction direction READ direction ) Q_PROPERTY( Orientation orientation READ orientation ) - Q_PROPERTY( bool masked READ isMasked ) + Q_PROPERTY( bool tqmasked READ isMasked ) Q_ENUMS( Direction ) friend class KasItem; @@ -152,7 +152,7 @@ public: bool isDrag() const { return inDrag; } - TQSize sizeHint( Orientation, TQSize max ); + TQSize tqsizeHint( Orientation, TQSize max ); // // Look and feel options @@ -188,7 +188,7 @@ public: void updateItem( KasItem *i ); /** Redraws the specified item. */ - void repaintItem(KasItem *i, bool erase = true ); + void tqrepaintItem(KasItem *i, bool erase = true ); /** Returns the item at p or 0. */ KasItem* itemAt(const TQPoint &p); @@ -229,7 +229,7 @@ public slots: void setBackground( const TQPixmap &pix ); - void setMasked( bool mask ); + void setMasked( bool tqmask ); void setPaintInactiveFrames( bool enable ); @@ -251,7 +251,7 @@ signals: void directionChanged(); /** Emitted when kasbar wants to resize. This happens when a new window is added. */ - void layoutChanged(); + void tqlayoutChanged(); /** Emitted when the item size is changed. */ void itemSizeChanged( int ); @@ -279,7 +279,7 @@ protected: /** Calls the paint methods for the items in the rectangle specified by the event. */ void paintEvent(TQPaintEvent *ev); - /** Forces the widget to re-layout it's contents. */ + /** Forces the widget to re-tqlayout it's contents. */ void resizeEvent(TQResizeEvent *ev); private: diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp index 3bc3dcd1b..14f1b02f1 100644 --- a/kicker/extensions/kasbar/kasbarextension.cpp +++ b/kicker/extensions/kasbar/kasbarextension.cpp @@ -97,7 +97,7 @@ KasBarExtension::KasBarExtension( const TQString& configFile, // setBackgroundMode( NoBackground ); kasbar = new KasTasker( orientation(), this, name ); - connect( kasbar, TQT_SIGNAL( layoutChanged() ), this, TQT_SIGNAL( updateLayout() ) ); + connect( kasbar, TQT_SIGNAL( tqlayoutChanged() ), this, TQT_SIGNAL( updateLayout() ) ); connect( kasbar, TQT_SIGNAL( detachedChanged(bool) ), this, TQT_SLOT( setDetached(bool) ) ); kasbar->setConfig( config() ); @@ -141,7 +141,7 @@ void KasBarExtension::showEvent( TQShowEvent */*se*/ ) { updateGeometry(); resize( kasbar->size() ); - repaint( true ); + tqrepaint( true ); } TQSize KasBarExtension::detachedSize() @@ -153,7 +153,7 @@ TQSize KasBarExtension::detachedSize() } -TQSize KasBarExtension::sizeHint(Position p, TQSize maxSize ) const +TQSize KasBarExtension::tqsizeHint(Position p, TQSize maxSize ) const { Orientation o = Horizontal; @@ -167,7 +167,7 @@ TQSize KasBarExtension::sizeHint(Position p, TQSize maxSize ) const return TQSize( 0, kasbar->itemExtent()/2 ); } - return kasbar->sizeHint( o, maxSize ); + return kasbar->tqsizeHint( o, maxSize ); } void KasBarExtension::positionChange( Position /* position */) diff --git a/kicker/extensions/kasbar/kasbarextension.h b/kicker/extensions/kasbar/kasbarextension.h index 7fbb4fbc6..e5e3142df 100644 --- a/kicker/extensions/kasbar/kasbarextension.h +++ b/kicker/extensions/kasbar/kasbarextension.h @@ -76,7 +76,7 @@ public: virtual ~KasBarExtension(); - TQSize sizeHint( Position, TQSize maxSize ) const; + TQSize tqsizeHint( Position, TQSize maxSize ) const; Position preferedPosition() const { return Right; } virtual void positionChange( Position position ); diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp index f025af857..f5fbe25b0 100644 --- a/kicker/extensions/kasbar/kasclockitem.cpp +++ b/kicker/extensions/kasbar/kasclockitem.cpp @@ -45,7 +45,7 @@ KasClockItem::KasClockItem( KasBar *parent ) lcd = new LCD( parent ); lcd->hide(); - lcd->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); + lcd->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); lcd->setBackgroundMode( NoBackground ); lcd->setFrameStyle( TQFrame::NoFrame ); lcd->setSegmentStyle( TQLCDNumber::Flat ); @@ -75,7 +75,7 @@ KasPopup *KasClockItem::createPopup() void KasClockItem::updateTime() { - setText( KGlobal::locale()->formatDate( TQDate::currentDate(), true /* shortFormat */ ) ); + setText( KGlobal::locale()->formatDate( TQDate::tqcurrentDate(), true /* shortFormat */ ) ); lcd->display( KGlobal::locale()->formatTime( TQTime::currentTime(), false /* includeSecs */, false /* isDuration */) ); update(); @@ -89,7 +89,7 @@ void KasClockItem::paint( TQPainter *p ) p->save(); p->translate( 3, 15 ); - lcd->setPaletteForegroundColor( kasbar()->colorGroup().mid() ); + lcd->setPaletteForegroundColor( kasbar()->tqcolorGroup().mid() ); lcd->draw( p ); p->restore(); diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp index 6e03e8e3c..a86c08303 100644 --- a/kicker/extensions/kasbar/kasgroupitem.cpp +++ b/kicker/extensions/kasbar/kasgroupitem.cpp @@ -83,8 +83,8 @@ KasGroupItem::KasGroupItem( KasTasker *parent ) setGroupItem( true ); setText( i18n("Group") ); - connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( hidePopup() ) ); - connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( update() ) ); + connect( parent, TQT_SIGNAL( tqlayoutChanged() ), this, TQT_SLOT( hidePopup() ) ); + connect( parent, TQT_SIGNAL( tqlayoutChanged() ), this, TQT_SLOT( update() ) ); connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) ); connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showGroupMenuAt(TQMouseEvent *) ) ); } diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp index 8fd795363..1ed9b2ed9 100644 --- a/kicker/extensions/kasbar/kasitem.cpp +++ b/kicker/extensions/kasbar/kasitem.cpp @@ -301,7 +301,7 @@ void KasItem::paintFrame( TQPainter *p ) if ( !frame ) return; - qDrawShadePanel(p, 0, 0, extent(), extent(), colorGroup(), false, 2); + qDrawShadePanel(p, 0, 0, extent(), extent(), tqcolorGroup(), false, 2); TQPen pen; @@ -547,15 +547,15 @@ void KasItem::paint( TQPainter *p, int x, int y ) p->restore(); } -void KasItem::repaint() +void KasItem::tqrepaint() { - repaint( true ); + tqrepaint( true ); } -void KasItem::repaint( bool erase ) +void KasItem::tqrepaint( bool erase ) { if ( kas->isVisible() ) - kas->repaintItem( this, erase ); + kas->tqrepaintItem( this, erase ); } void KasItem::update() diff --git a/kicker/extensions/kasbar/kasitem.h b/kicker/extensions/kasbar/kasitem.h index c16a5f6d3..61efc85e9 100644 --- a/kicker/extensions/kasbar/kasitem.h +++ b/kicker/extensions/kasbar/kasitem.h @@ -170,8 +170,8 @@ public: void paintModified( TQPainter *p ); public slots: - void repaint(); - void repaint( bool erase ); + void tqrepaint(); + void tqrepaint( bool erase ); void update(); void setActive( bool yes ); @@ -217,7 +217,7 @@ protected: TQFontMetrics fontMetrics() const { return kas->fontMetrics(); } /** Gets the color group from the parent. */ - const TQColorGroup &colorGroup() const { return kas->colorGroup(); } + const TQColorGroup &tqcolorGroup() const { return kas->tqcolorGroup(); } /** Factory method that creates a popup widget for the item. */ virtual KasPopup *createPopup(); diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp index 7b6939760..e36d2d18d 100644 --- a/kicker/extensions/kasbar/kasloaditem.cpp +++ b/kicker/extensions/kasbar/kasloaditem.cpp @@ -95,7 +95,7 @@ void KasLoadItem::paint( TQPainter *p ) KasItem::paint( p ); - TQColor light = kasbar()->colorGroup().highlight(); + TQColor light = kasbar()->tqcolorGroup().highlight(); TQColor dark = light.dark(); KPixmap pix; @@ -103,7 +103,7 @@ void KasLoadItem::paint( TQPainter *p ) KPixmapEffect::gradient( pix, light, dark, KPixmapEffect::DiagonalGradient ); p->drawPixmap( 2, extent()-2-h, pix ); - p->setPen( kasbar()->colorGroup().mid() ); + p->setPen( kasbar()->tqcolorGroup().mid() ); for ( double pos = 0.2 ; pos < 1.0 ; pos += 0.2 ) { int ypos = (int) floor((extent()-2) - (dh*maxValue*pos)); p->drawLine( 2, ypos, extent()-3, ypos ); diff --git a/kicker/extensions/kasbar/kaspopup.cpp b/kicker/extensions/kasbar/kaspopup.cpp index 7538dfbb2..9dfe480f2 100644 --- a/kicker/extensions/kasbar/kaspopup.cpp +++ b/kicker/extensions/kasbar/kaspopup.cpp @@ -96,21 +96,21 @@ TQPoint KasPopup::calcPosition( KasItem *item, int w, int h ) int y = pos.y(); if ( kasbar->orientation() == Horizontal ) { - if ( y < ( qApp->desktop()->height() / 2 ) ) + if ( y < ( tqApp->desktop()->height() / 2 ) ) y = y + kasbar->itemExtent(); else y = y - h; - if ( (x + w) > qApp->desktop()->width() ) + if ( (x + w) > tqApp->desktop()->width() ) x = x - w + kasbar->itemExtent(); } else { - if ( x < ( qApp->desktop()->width() / 2 ) ) + if ( x < ( tqApp->desktop()->width() / 2 ) ) x = x + kasbar->itemExtent(); else x = x - w; - if ( (y + h) > qApp->desktop()->height() ) + if ( (y + h) > tqApp->desktop()->height() ) y = y - h + kasbar->itemExtent(); } diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp index e81b0aacb..8886f671d 100644 --- a/kicker/extensions/kasbar/kasprefsdlg.cpp +++ b/kicker/extensions/kasbar/kasprefsdlg.cpp @@ -408,7 +408,7 @@ void KasPrefsDialog::addAdvancedPage() notifierCheck->setChecked( kasbar->notifierEnabled() ); connect( notifierCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setNotifierEnabled(bool) ) ); - // Status advanced + // tqStatus advanced modifiedCheck = new TQCheckBox( i18n("Enable &modified indicator"), advancedPage ); TQWhatsThis::add( modifiedCheck, i18n( "Enables the display of a floppy disk state icon for windows containing " diff --git a/kicker/extensions/kasbar/kasresources.cpp b/kicker/extensions/kasbar/kasresources.cpp index 78b25e8c0..3450b1549 100644 --- a/kicker/extensions/kasbar/kasresources.cpp +++ b/kicker/extensions/kasbar/kasresources.cpp @@ -308,7 +308,7 @@ KPixmap KasResources::activeBg() if ( actBg.isNull() ) { actBg.resize( kasbar->itemExtent(), kasbar->itemExtent() ); KPixmapEffect::gradient( actBg, - kasbar->colorGroup().light(), kasbar->colorGroup().mid(), + kasbar->tqcolorGroup().light(), kasbar->tqcolorGroup().mid(), KPixmapEffect::DiagonalGradient ); } @@ -320,7 +320,7 @@ KPixmap KasResources::inactiveBg() if ( inactBg.isNull() ) { inactBg.resize( kasbar->itemExtent(), kasbar->itemExtent() ); KPixmapEffect::gradient( inactBg, - kasbar->colorGroup().mid(), kasbar->colorGroup().dark(), + kasbar->tqcolorGroup().mid(), kasbar->tqcolorGroup().dark(), KPixmapEffect::DiagonalGradient ); } diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp index a087f40ff..bb36ae522 100644 --- a/kicker/extensions/kasbar/kastasker.cpp +++ b/kicker/extensions/kasbar/kastasker.cpp @@ -207,7 +207,7 @@ KPopupMenu *KasTasker::contextMenu() if ( standalone_ ) { menu->insertSeparator(); - menu->insertItem( SmallIcon("exit"), i18n("&Quit"), qApp, TQT_SLOT( quit() ) ); + menu->insertItem( SmallIcon("exit"), i18n("&Quit"), tqApp, TQT_SLOT( quit() ) ); } } diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp index c9ec7bdd0..121e0f1eb 100644 --- a/kicker/extensions/kasbar/kastaskitem.cpp +++ b/kicker/extensions/kasbar/kastaskitem.cpp @@ -165,9 +165,9 @@ void KasTaskItem::checkAttention() setAttention( task_->demandsAttention() ); } -void KasTaskItem::updateTask(bool geometryChangeOnly) +void KasTaskItem::updateTask(bool tqgeometryChangeOnly) { - if (geometryChangeOnly) + if (tqgeometryChangeOnly) { return; } @@ -422,7 +422,7 @@ TQWidget *KasTaskItem::createTaskProps( TQObject *target, TQWidget *parent, bool taskprops->addColumn( i18n("Value") ); // Create List Items - TQMetaObject *mo = target->metaObject(); + TQMetaObject *mo = target->tqmetaObject(); for ( int i = 0; i < mo->numProperties( recursive ); i++ ) { const TQMetaProperty *p = mo->property(i, recursive); @@ -445,7 +445,7 @@ TQString KasTaskItem::expandMacros( const TQString &format, TQObject *data ) if ( pos >= 0 ) { TQVariant val = data->property( re.cap(1).latin1() ); TQString v = val.asString(); - s.replace( pos, re.matchedLength(), v ); + s.tqreplace( pos, re.matchedLength(), v ); pos = pos + v.length(); } } @@ -456,7 +456,7 @@ TQString KasTaskItem::expandMacros( const TQString &format, TQObject *data ) TQWidget *KasTaskItem::createX11Props( TQWidget *parent ) { TQVBox *vb2 = new TQVBox( parent ); - vb2->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); + vb2->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); vb2->setSpacing( KDialog::spacingHint() ); vb2->setMargin( KDialog::marginHint() ); diff --git a/kicker/extensions/kasbar/kastaskitem.h b/kicker/extensions/kasbar/kastaskitem.h index b2b166ef5..5118a4263 100644 --- a/kicker/extensions/kasbar/kastaskitem.h +++ b/kicker/extensions/kasbar/kastaskitem.h @@ -90,7 +90,7 @@ class KasTaskItem : public KasItem TQString expandMacros( const TQString &format, TQObject *data ); public slots: - void updateTask(bool geometryChangeOnly); + void updateTask(bool tqgeometryChangeOnly); /** Create a thumbnail for this task (does nothing if they're disabled). */ void refreshThumbnail(); diff --git a/kicker/extensions/kasbar/kastaskpopup.cpp b/kicker/extensions/kasbar/kastaskpopup.cpp index 25c096a65..9a59e1603 100644 --- a/kicker/extensions/kasbar/kastaskpopup.cpp +++ b/kicker/extensions/kasbar/kastaskpopup.cpp @@ -91,7 +91,7 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name ) } KPixmapEffect::gradient( titleBg, - Qt::black, colorGroup().mid(), + Qt::black, tqcolorGroup().mid(), KPixmapEffect::DiagonalGradient ); connect( item->task(), TQT_SIGNAL( thumbnailChanged() ), TQT_SLOT( refresh() ) ); diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp index 401c67fbd..424414a3a 100644 --- a/kicker/extensions/sidebar/sidebarextension.cpp +++ b/kicker/extensions/sidebar/sidebarextension.cpp @@ -50,8 +50,8 @@ SidebarExtension::SidebarExtension( const TQString& configFile, { kdDebug() << "SidebarExtension: Created '" << name << "', '" << configFile << "'" << endl; new KonqHistoryManager(0,"SidebarExtensionHistoryManager"); - m_layout=new TQHBoxLayout(this); - m_layout->activate(); + m_tqlayout=new TQHBoxLayout(this); + m_tqlayout->activate(); m_sbWrapper=new TQVBox(this); KParts::ReadOnlyPart *p=KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadOnlyPart>( "konq_sidebar", @@ -94,7 +94,7 @@ void SidebarExtension::needLayoutUpdate(bool exp) { m_currentWidth=24; m_resizeHandle->hide(); } - topLevelWidget()->setFixedWidth(m_currentWidth); + tqtopLevelWidget()->setFixedWidth(m_currentWidth); emit updateLayout(); } @@ -117,7 +117,7 @@ bool SidebarExtension::eventFilter( TQObject *, TQEvent *e ) { return true; } else if (e->type()==TQEvent::MouseButtonRelease) { m_resizing=false; - m_expandedSize=topLevelWidget()->width(); + m_expandedSize=tqtopLevelWidget()->width(); needLayoutUpdate(true); return true; } else if (e->type()==TQEvent::MouseMove) { @@ -126,14 +126,14 @@ bool SidebarExtension::eventFilter( TQObject *, TQEvent *e ) { if (p==Left) { int diff=((TQMouseEvent*)e)->globalX()-m_x; if (abs(diff)>3) { - topLevelWidget()->setFixedWidth(topLevelWidget()->width()+diff); + tqtopLevelWidget()->setFixedWidth(tqtopLevelWidget()->width()+diff); m_x=((TQMouseEvent*)e)->globalX(); } } else if (p==Right) { int diff=((TQMouseEvent*)e)->globalX()-m_x; if (abs(diff)>3) { - topLevelWidget()->setFixedWidth(topLevelWidget()->width()-diff); - topLevelWidget()->move(topLevelWidget()->x()+diff,topLevelWidget()->y()); + tqtopLevelWidget()->setFixedWidth(tqtopLevelWidget()->width()-diff); + tqtopLevelWidget()->move(tqtopLevelWidget()->x()+diff,tqtopLevelWidget()->y()); m_x=((TQMouseEvent*)e)->globalX(); } } @@ -148,24 +148,24 @@ KPanelExtension::Position SidebarExtension::preferedPosition() const { return KPanelExtension::Left; } -TQSize SidebarExtension::sizeHint(Position, TQSize maxSize ) const +TQSize SidebarExtension::tqsizeHint(Position, TQSize maxSize ) const { return TQSize(m_currentWidth,maxSize.height()); } void SidebarExtension::positionChange( Position position ) { if (position == Right) { - m_layout->remove(m_sbWrapper); - m_layout->remove(m_resizeHandle); + m_tqlayout->remove(m_sbWrapper); + m_tqlayout->remove(m_resizeHandle); - m_layout->add(m_resizeHandle); - m_layout->add(m_sbWrapper); + m_tqlayout->add(m_resizeHandle); + m_tqlayout->add(m_sbWrapper); } else if (position == Left) { - m_layout->remove(m_sbWrapper); - m_layout->remove(m_resizeHandle); + m_tqlayout->remove(m_sbWrapper); + m_tqlayout->remove(m_resizeHandle); - m_layout->add(m_sbWrapper); - m_layout->add(m_resizeHandle); + m_tqlayout->add(m_sbWrapper); + m_tqlayout->add(m_resizeHandle); } diff --git a/kicker/extensions/sidebar/sidebarextension.h b/kicker/extensions/sidebar/sidebarextension.h index 4d0d1646b..7dea6b0fb 100644 --- a/kicker/extensions/sidebar/sidebarextension.h +++ b/kicker/extensions/sidebar/sidebarextension.h @@ -36,7 +36,7 @@ public: virtual ~SidebarExtension(); - TQSize sizeHint( Position, TQSize maxSize ) const; + TQSize tqsizeHint( Position, TQSize maxSize ) const; Position preferedPosition() const; virtual void positionChange( Position position ); @@ -55,7 +55,7 @@ private: TQFrame *m_resizeHandle; bool m_resizing; int m_expandedSize; - TQHBoxLayout *m_layout; + TQHBoxLayout *m_tqlayout; TQVBox *m_sbWrapper; }; diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp index e0deb768e..99a131926 100644 --- a/kicker/extensions/taskbar/taskbarextension.cpp +++ b/kicker/extensions/taskbar/taskbarextension.cpp @@ -57,11 +57,11 @@ TaskBarExtension::TaskBarExtension(const TQString& configFile, Type type, m_bgFilename(0), m_rootPixmap(0) { - TQHBoxLayout *layout = new TQHBoxLayout(this); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this); m_container = new TaskBarContainer(false, this); m_container->setBackgroundOrigin(AncestorOrigin); positionChange(position()); - layout->addWidget(m_container); + tqlayout->addWidget(m_container); connect(m_container, TQT_SIGNAL(containerCountChanged()), TQT_SIGNAL(updateLayout())); @@ -123,17 +123,17 @@ void TaskBarExtension::preferences() m_container->preferences(); } -TQSize TaskBarExtension::sizeHint(Position p, TQSize maxSize) const +TQSize TaskBarExtension::tqsizeHint(Position p, TQSize maxSize) const { if (p == Left || p == Right) maxSize.setWidth(sizeInPixels()); else maxSize.setHeight(sizeInPixels()); -// kdDebug(1210) << "TaskBarExtension::sizeHint( Position, TQSize )" << endl; +// kdDebug(1210) << "TaskBarExtension::tqsizeHint( Position, TQSize )" << endl; // kdDebug(1210) << " width: " << size.width() << endl; // kdDebug(1210) << "height: " << size.height() << endl; - return m_container->sizeHint(p, maxSize); + return m_container->tqsizeHint(p, maxSize); } void TaskBarExtension::configure() @@ -155,7 +155,7 @@ void TaskBarExtension::setBackgroundTheme() } else { - m_rootPixmap->repaint(true); + m_rootPixmap->tqrepaint(true); } double tint = double(KickerSettings::tintValue()) / 100; diff --git a/kicker/extensions/taskbar/taskbarextension.h b/kicker/extensions/taskbar/taskbarextension.h index 2848e80c7..92c065beb 100644 --- a/kicker/extensions/taskbar/taskbarextension.h +++ b/kicker/extensions/taskbar/taskbarextension.h @@ -49,7 +49,7 @@ public: int actions = 0, TQWidget *parent = 0, const char *name = 0 ); ~TaskBarExtension(); - TQSize sizeHint( Position, TQSize maxSize ) const; + TQSize tqsizeHint( Position, TQSize maxSize ) const; Position preferedPosition() const { return Bottom; } protected: diff --git a/kicker/kicker/buttons/bookmarksbutton.h b/kicker/kicker/buttons/bookmarksbutton.h index 3d8518519..d150688f0 100644 --- a/kicker/kicker/buttons/bookmarksbutton.h +++ b/kicker/kicker/buttons/bookmarksbutton.h @@ -32,7 +32,7 @@ class KActionCollection; class KBookmarkOwner; /** - * Button that contains a bookmark menu + * Button that tqcontains a bookmark menu */ class BookmarksButton : public PanelPopupButton { diff --git a/kicker/kicker/buttons/browserbutton.cpp b/kicker/kicker/buttons/browserbutton.cpp index 2e2cb5a2d..4a8c9a7af 100644 --- a/kicker/kicker/buttons/browserbutton.cpp +++ b/kicker/kicker/buttons/browserbutton.cpp @@ -103,7 +103,7 @@ void BrowserButton::dropEvent( TQDropEvent *ev ) { KURL path ( topMenu->path() ); _menuTimer->stop(); - KFileItem item( path, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); + KFileItem item( path, TQString::tqfromLatin1( "inode/directory" ), KFileItem::Unknown ); KonqOperations::doDrop( &item, path, ev, this ); PanelButton::dropEvent(ev); } diff --git a/kicker/kicker/buttons/browserbutton.h b/kicker/kicker/buttons/browserbutton.h index bb08801d9..cd64b3539 100644 --- a/kicker/kicker/buttons/browserbutton.h +++ b/kicker/kicker/buttons/browserbutton.h @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class PanelBrowserMenu; /** - * Button that contains a Browser directory menu + * Button that tqcontains a Browser directory menu */ class BrowserButton : public PanelPopupButton { diff --git a/kicker/kicker/buttons/desktopbutton.cpp b/kicker/kicker/buttons/desktopbutton.cpp index 9f23741e5..71bcaa2e5 100644 --- a/kicker/kicker/buttons/desktopbutton.cpp +++ b/kicker/kicker/buttons/desktopbutton.cpp @@ -77,7 +77,7 @@ void DesktopButton::dragEnterEvent( TQDragEnterEvent *ev ) void DesktopButton::dropEvent( TQDropEvent *ev ) { KURL dPath ( KGlobalSettings::desktopPath() ); - KFileItem item( dPath, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); + KFileItem item( dPath, TQString::tqfromLatin1( "inode/directory" ), KFileItem::Unknown ); KonqOperations::doDrop( &item, dPath, ev, this ); PanelButton::dropEvent(ev); } diff --git a/kicker/kicker/buttons/kbutton.h b/kicker/kicker/buttons/kbutton.h index bf98e74f8..469b0fab5 100644 --- a/kicker/kicker/buttons/kbutton.h +++ b/kicker/kicker/buttons/kbutton.h @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "panelbutton.h" /** - * Button that contains the PanelKMenu and client menu manager. + * Button that tqcontains the PanelKMenu and client menu manager. */ class KButton : public PanelPopupButton { diff --git a/kicker/kicker/buttons/knewbutton.cpp b/kicker/kicker/buttons/knewbutton.cpp index 9c9f438ac..a395b3cb6 100644 --- a/kicker/kicker/buttons/knewbutton.cpp +++ b/kicker/kicker/buttons/knewbutton.cpp @@ -70,7 +70,7 @@ KNewButton::KNewButton( TQWidget* parent ) m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_basic.mng")); m_movie->connectUpdate(this, TQT_SLOT(updateMovie())); - m_movie->connectStatus(this, TQT_SLOT(slotStatus(int))); + m_movie->connecttqStatus(this, TQT_SLOT(slottqStatus(int))); m_movie->connectResize(this, TQT_SLOT(slotSetSize(const TQSize&))); TQApplication::desktop()->screen()->installEventFilter(this); @@ -85,7 +85,7 @@ KNewButton::~KNewButton() delete m_movie; } -void KNewButton::slotStatus(int status) +void KNewButton::slottqStatus(int status) { if(status == TQMovie::EndOfLoop) slotStopAnimation(); @@ -99,7 +99,7 @@ TQColor KNewButton::borderColor() const QRgb rgb = img.pixel(orientation() == Qt::Horizontal ? img.width() - i - 1 : i, 2); - if (qGreen(rgb) > 0x50) + if (tqGreen(rgb) > 0x50) return rgb; } @@ -151,7 +151,7 @@ void KNewButton::setPopupDirection(KPanelApplet::Direction d) } m_movie->connectUpdate(this, TQT_SLOT(updateMovie())); - m_movie->connectStatus(this, TQT_SLOT(slotStatus(int))); + m_movie->connecttqStatus(this, TQT_SLOT(slottqStatus(int))); m_movie->connectResize(this, TQT_SLOT(slotSetSize(const TQSize&))); } @@ -215,7 +215,7 @@ bool KNewButton::eventFilter(TQObject *o, TQEvent *e) e->type() == TQEvent::MouseButtonDblClick ) { TQMouseEvent *me = static_cast<TQMouseEvent *>(e); - if (rect().contains(mapFromGlobal(me->globalPos()))) + if (rect().tqcontains(mapFromGlobal(me->globalPos()))) { if (m_pressedDuringPopup && m_popup && m_openTimer != -1 && (me->button() & Qt::LeftButton) ) @@ -286,7 +286,7 @@ void KNewButton::drawEye() } m_active_pixmap = pixmap.xForm(matrix); - repaint(false); + tqrepaint(false); } #undef eye_x #undef eye_y @@ -355,9 +355,9 @@ void KNewButton::mouseMoveEvent(TQMouseEvent* e) { KButton::mouseMoveEvent(e); - m_mouseInside = m_sloppyRegion.contains(e->pos()); + m_mouseInside = m_sloppyRegion.tqcontains(e->pos()); - if ( m_sloppyRegion.contains(e->pos())) + if ( m_sloppyRegion.tqcontains(e->pos())) { if (m_hoverTimer == -1 && KickerSettings::openOnHover()) m_hoverTimer = startTimer(kMax(200,TQApplication::doubleClickInterval()/2)); diff --git a/kicker/kicker/buttons/knewbutton.h b/kicker/kicker/buttons/knewbutton.h index bcb8b8743..8be1a8600 100644 --- a/kicker/kicker/buttons/knewbutton.h +++ b/kicker/kicker/buttons/knewbutton.h @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqpoint.h> /** - * Button that contains the PanelKMenu and client menu manager. + * Button that tqcontains the PanelKMenu and client menu manager. */ class KNewButton : public KButton { @@ -57,7 +57,7 @@ public: virtual void setPopupDirection(KPanelApplet::Direction d); private slots: - void slotStatus(int); + void slottqStatus(int); void slotSetSize(const TQSize&); void slotStopAnimation(); void rewindMovie(); diff --git a/kicker/kicker/buttons/nonkdeappbutton.cpp b/kicker/kicker/buttons/nonkdeappbutton.cpp index 29b7ddb2e..e91a06f37 100644 --- a/kicker/kicker/buttons/nonkdeappbutton.cpp +++ b/kicker/kicker/buttons/nonkdeappbutton.cpp @@ -41,7 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // our own definition #include "nonkdeappbutton.h" -// we include the "moc" file so that the KDE build system knows to create it +// we include the "tqmoc" file so that the KDE build system knows to create it #include "nonkdeappbutton.moc" // this is one of the two constructors. gets called when creating a new button diff --git a/kicker/kicker/buttons/nonkdeappbutton.h b/kicker/kicker/buttons/nonkdeappbutton.h index 217f2c22c..44cbb2f0d 100644 --- a/kicker/kicker/buttons/nonkdeappbutton.h +++ b/kicker/kicker/buttons/nonkdeappbutton.h @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class PanelExeDialog; /** - * Button that contains a non-KDE application + * Button that tqcontains a non-KDE application * subclass of PanelButton */ class NonKDEAppButton : public PanelButton diff --git a/kicker/kicker/buttons/servicemenubutton.h b/kicker/kicker/buttons/servicemenubutton.h index 0bd05b8ee..dda61dab6 100644 --- a/kicker/kicker/buttons/servicemenubutton.h +++ b/kicker/kicker/buttons/servicemenubutton.h @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class PanelServiceMenu; /** - * Button that contains a Service menu + * Button that tqcontains a Service menu */ class ServiceMenuButton : public PanelPopupButton { diff --git a/kicker/kicker/buttons/windowlistbutton.h b/kicker/kicker/buttons/windowlistbutton.h index d8b57c62e..19032083b 100644 --- a/kicker/kicker/buttons/windowlistbutton.h +++ b/kicker/kicker/buttons/windowlistbutton.h @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class KWindowListMenu; /** - * Button that contains a windowlist menu + * Button that tqcontains a windowlist menu */ class WindowListButton : public PanelPopupButton { diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp index f5f398136..5d4bb57f2 100644 --- a/kicker/kicker/core/applethandle.cpp +++ b/kicker/kicker/core/applethandle.cpp @@ -52,17 +52,17 @@ AppletHandle::AppletHandle(AppletContainer* parent) { setBackgroundOrigin(AncestorOrigin); setMinimumSize(widthForHeight(0), heightForWidth(0)); - m_layout = new TQBoxLayout(this, TQBoxLayout::BottomToTop, 0, 0); + m_tqlayout = new TQBoxLayout(this, TQBoxLayout::BottomToTop, 0, 0); m_dragBar = new AppletHandleDrag(this); m_dragBar->installEventFilter(this); - m_layout->addWidget(m_dragBar); + m_tqlayout->addWidget(m_dragBar); if (kapp->authorizeKAction("kicker_rmb")) { m_menuButton = new AppletHandleButton( this ); m_menuButton->installEventFilter(this); - m_layout->addWidget(m_menuButton); + m_tqlayout->addWidget(m_menuButton); connect(m_menuButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(menuButtonPressed())); @@ -75,14 +75,14 @@ AppletHandle::AppletHandle(AppletContainer* parent) int AppletHandle::heightForWidth( int /* w */ ) const { - int size = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int size = style().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); return size; } int AppletHandle::widthForHeight( int /* h */ ) const { - int size = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int size = style().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); return size; } @@ -101,25 +101,25 @@ void AppletHandle::setPopupDirection(KPanelApplet::Direction d) switch (m_popupDirection) { case KPanelApplet::Up: - m_layout->setDirection(TQBoxLayout::BottomToTop); + m_tqlayout->setDirection(TQBoxLayout::BottomToTop); a = Qt::UpArrow; break; case KPanelApplet::Down: - m_layout->setDirection(TQBoxLayout::TopToBottom); + m_tqlayout->setDirection(TQBoxLayout::TopToBottom); a = Qt::DownArrow; break; case KPanelApplet::Left: - m_layout->setDirection(TQBoxLayout::RightToLeft); + m_tqlayout->setDirection(TQBoxLayout::RightToLeft); a = Qt::LeftArrow; break; case KPanelApplet::Right: - m_layout->setDirection(TQBoxLayout::LeftToRight); + m_tqlayout->setDirection(TQBoxLayout::LeftToRight); a = Qt::RightArrow; break; } m_menuButton->setArrowType(a); - m_layout->activate(); + m_tqlayout->activate(); } void AppletHandle::resetLayout() @@ -200,7 +200,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) // a hack for applets that have out-of-process // elements (e.g the systray) so that the handle // doesn't flicker when moving over those elements - if (w->rect().contains(w->mapFromGlobal(TQCursor::pos()))) + if (w->rect().tqcontains(w->mapFromGlobal(TQCursor::pos()))) { nowDrawIt = true; } @@ -269,7 +269,7 @@ void AppletHandle::checkHandleHover() { if (!m_handleHoverTimer || (m_menuButton && m_menuButton->isOn()) || - m_applet->geometry().contains(m_applet->mapToParent( + m_applet->tqgeometry().tqcontains(m_applet->mapToParent( m_applet->mapFromGlobal(TQCursor::pos())))) { return; @@ -282,7 +282,7 @@ void AppletHandle::checkHandleHover() bool AppletHandle::onMenuButton(const TQPoint& point) const { - return m_menuButton && (childAt(mapFromGlobal(point)) == m_menuButton); + return m_menuButton && (tqchildAt(mapFromGlobal(point)) == m_menuButton); } void AppletHandle::toggleMenuButtonOff() @@ -308,9 +308,9 @@ AppletHandleDrag::AppletHandleDrag(AppletHandle* parent) setBackgroundOrigin( AncestorOrigin ); } -TQSize AppletHandleDrag::minimumSizeHint() const +TQSize AppletHandleDrag::tqminimumSizeHint() const { - int wh = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int wh = style().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); if (m_parent->orientation() == Horizontal) { @@ -368,7 +368,7 @@ void AppletHandleDrag::paintEvent(TQPaintEvent *) TQRect r = rect(); style().drawPrimitive(TQStyle::PE_DockWindowHandle, &p, r, - colorGroup(), flags); + tqcolorGroup(), flags); } else { @@ -382,9 +382,9 @@ AppletHandleButton::AppletHandleButton(AppletHandle *parent) { } -TQSize AppletHandleButton::minimumSizeHint() const +TQSize AppletHandleButton::tqminimumSizeHint() const { - int height = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int height = style().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); int width = height; if (m_parent->orientation() == Horizontal) diff --git a/kicker/kicker/core/applethandle.h b/kicker/kicker/core/applethandle.h index 5eff46717..ad80e2ee6 100644 --- a/kicker/kicker/core/applethandle.h +++ b/kicker/kicker/core/applethandle.h @@ -76,7 +76,7 @@ class AppletHandle : public QWidget private: AppletContainer* m_applet; - TQBoxLayout* m_layout; + TQBoxLayout* m_tqlayout; AppletHandleDrag* m_dragBar; AppletHandleButton* m_menuButton; bool m_drawHandle; @@ -92,9 +92,9 @@ class AppletHandleDrag : public QWidget public: AppletHandleDrag(AppletHandle* parent); - TQSize minimumSizeHint() const; - TQSize minimumSize() const { return minimumSizeHint(); } - TQSize sizeHint() const { return minimumSize(); } + TQSize tqminimumSizeHint() const; + TQSize tqminimumSize() const { return tqminimumSizeHint(); } + TQSize tqsizeHint() const { return tqminimumSize(); } TQSizePolicy sizePolicy() const; protected: @@ -113,9 +113,9 @@ class AppletHandleButton : public SimpleArrowButton public: AppletHandleButton(AppletHandle *parent); - TQSize minimumSizeHint() const; - TQSize minimumSize() const { return minimumSizeHint(); } - TQSize sizeHint() const { return minimumSize(); } + TQSize tqminimumSizeHint() const; + TQSize tqminimumSize() const { return tqminimumSizeHint(); } + TQSize tqsizeHint() const { return tqminimumSize(); } TQSizePolicy sizePolicy() const; private: diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp index 77c6d1912..764c66846 100644 --- a/kicker/kicker/core/container_applet.cpp +++ b/kicker/kicker/core/container_applet.cpp @@ -65,7 +65,7 @@ AppletContainer::AppletContainer(const AppletInfo& info, TQString(info.library() + "container").latin1()), _info(info), _handle(0), - _layout(0), + _tqlayout(0), _type(KPanelApplet::Normal), _widthForHeightHint(0), _heightForWidthHint(0), @@ -81,24 +81,24 @@ AppletContainer::AppletContainer(const AppletInfo& info, if (orientation() == Horizontal) { - _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight, 0, 0); + _tqlayout = new TQBoxLayout(this, TQBoxLayout::LeftToRight, 0, 0); } else { - _layout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, 0, 0); + _tqlayout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, 0, 0); } - _layout->setResizeMode( TQLayout::FreeResize ); + _tqlayout->setResizeMode( TQLayout::FreeResize ); - _layout->addSpacing(APPLET_MARGIN); + _tqlayout->addSpacing(APPLET_MARGIN); _handle = new AppletHandle(this); - _layout->addWidget(_handle, 0); + _tqlayout->addWidget(_handle, 0); connect(_handle, TQT_SIGNAL(moveApplet(const TQPoint&)), this, TQT_SLOT(moveApplet(const TQPoint&))); connect(_handle, TQT_SIGNAL(showAppletMenu()), this, TQT_SLOT(showAppletMenu())); - _layout->addWidget(_appletframe, 1); - _layout->activate(); + _tqlayout->addWidget(_appletframe, 1); + _tqlayout->activate(); _deskFile = info.desktopFile(); _configFile = info.configFile(); @@ -117,7 +117,7 @@ AppletContainer::AppletContainer(const AppletInfo& info, _valid = true; _applet->setPosition((KPanelApplet::Position)KickerLib::directionToPosition(popupDirection())); - _applet->setAlignment((KPanelApplet::Alignment)alignment()); + _applet->tqsetAlignment((KPanelApplet::Alignment)tqalignment()); _actions = _applet->actions(); _type = _applet->type(); @@ -193,14 +193,14 @@ void AppletContainer::resetLayout() if (orientation() == Horizontal) { - _layout->setDirection( TQBoxLayout::LeftToRight ); + _tqlayout->setDirection( TQBoxLayout::LeftToRight ); } else { - _layout->setDirection( TQBoxLayout::TopToBottom ); + _tqlayout->setDirection( TQBoxLayout::TopToBottom ); } - _layout->activate(); + _tqlayout->activate(); } void AppletContainer::moveApplet( const TQPoint& moveOffset ) @@ -275,14 +275,14 @@ void AppletContainer::slotRemoved(KConfig* config) void AppletContainer::activateWindow() { - KWin::forceActiveWindow(topLevelWidget()->winId()); + KWin::forceActiveWindow(tqtopLevelWidget()->winId()); } void AppletContainer::focusRequested(bool focus) { if (focus) { - KWin::forceActiveWindow(topLevelWidget()->winId()); + KWin::forceActiveWindow(tqtopLevelWidget()->winId()); } emit maintainFocus(focus); @@ -295,7 +295,7 @@ void AppletContainer::doLoadConfiguration( KConfigGroup& config ) } void AppletContainer::doSaveConfiguration( KConfigGroup& config, - bool layoutOnly ) const + bool tqlayoutOnly ) const { // immutability is checked by ContainerBase if (orientation() == Horizontal) @@ -307,7 +307,7 @@ void AppletContainer::doSaveConfiguration( KConfigGroup& config, config.writeEntry( "HeightForWidthHint", heightForWidth(width()) ); } - if (!layoutOnly) + if (!tqlayoutOnly) { config.writePathEntry( "ConfigFile", _configFile ); config.writePathEntry( "DesktopFile", _deskFile ); @@ -354,14 +354,14 @@ void AppletContainer::slotDelayedDestruct() delete this; } -void AppletContainer::alignmentChange(KPanelExtension::Alignment a) +void AppletContainer::tqalignmentChange(KPanelExtension::Alignment a) { if (!_applet) { return; } - _applet->setAlignment( (KPanelApplet::Alignment)a ); + _applet->tqsetAlignment( (KPanelApplet::Alignment)a ); } int AppletContainer::widthForHeight(int h) const diff --git a/kicker/kicker/core/container_applet.h b/kicker/kicker/core/container_applet.h index 019e52c96..12f5c2c7d 100644 --- a/kicker/kicker/core/container_applet.h +++ b/kicker/kicker/core/container_applet.h @@ -83,15 +83,15 @@ public slots: protected: virtual void doLoadConfiguration( KConfigGroup& ); - virtual void doSaveConfiguration( KConfigGroup&, bool layoutOnly ) const; - virtual void alignmentChange(KPanelExtension::Alignment a); + virtual void doSaveConfiguration( KConfigGroup&, bool tqlayoutOnly ) const; + virtual void tqalignmentChange(KPanelExtension::Alignment a); virtual TQPopupMenu* createOpMenu(); AppletInfo _info; AppletHandle *_handle; TQHBox *_appletframe; - TQBoxLayout *_layout; + TQBoxLayout *_tqlayout; KPanelApplet::Type _type; int _widthForHeightHint; int _heightForWidthHint; diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp index bb3d7d984..957262b34 100644 --- a/kicker/kicker/core/container_base.cpp +++ b/kicker/kicker/core/container_base.cpp @@ -38,7 +38,7 @@ BaseContainer::BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent, const : TQWidget( parent, name ) , _dir(KPanelApplet::Up) , _orient(Horizontal) - , _alignment(KPanelExtension::LeftTop) + , _tqalignment(KPanelExtension::LeftTop) , _fspace(0) , _moveOffset(TQPoint(0,0)) , _aid(TQString::null) @@ -77,7 +77,7 @@ void BaseContainer::loadConfiguration( KConfigGroup& group ) } void BaseContainer::saveConfiguration(KConfigGroup& group, - bool layoutOnly) const + bool tqlayoutOnly) const { if (isImmutable()) { @@ -87,7 +87,7 @@ void BaseContainer::saveConfiguration(KConfigGroup& group, // write positioning info group.writeEntry( "FreeSpace2", freeSpace() ); // write type specific info - doSaveConfiguration( group, layoutOnly ); + doSaveConfiguration( group, tqlayoutOnly ); } void BaseContainer::configure(KPanelExtension::Orientation o, @@ -110,15 +110,15 @@ void BaseContainer::slotRemoved(KConfig* config) config->sync(); } -void BaseContainer::setAlignment(KPanelExtension::Alignment a) +void BaseContainer::tqsetAlignment(KPanelExtension::Alignment a) { - if (_alignment == a) + if (_tqalignment == a) { return; } - _alignment = a; - alignmentChange(a); + _tqalignment = a; + tqalignmentChange(a); } TQPopupMenu* BaseContainer::opMenu() diff --git a/kicker/kicker/core/container_base.h b/kicker/kicker/core/container_base.h index 1c218b103..bdf965f8d 100644 --- a/kicker/kicker/core/container_base.h +++ b/kicker/kicker/core/container_base.h @@ -73,7 +73,7 @@ public: KPanelApplet::Direction popupDirection() const { return _dir; } KPanelExtension::Orientation orientation() const { return _orient; } - KPanelExtension::Alignment alignment() const { return _alignment; } + KPanelExtension::Alignment tqalignment() const { return _tqalignment; } virtual void setBackground() {} @@ -81,7 +81,7 @@ public: void clearOpMenu(); void loadConfiguration( KConfigGroup& ); - void saveConfiguration( KConfigGroup&, bool layoutOnly = false ) const; + void saveConfiguration( KConfigGroup&, bool tqlayoutOnly = false ) const; void configure(KPanelExtension::Orientation, KPanelApplet::Direction); virtual void configure() {} @@ -97,7 +97,7 @@ public slots: virtual void setPopupDirection(KPanelApplet::Direction d) { _dir = d; } virtual void setOrientation(KPanelExtension::Orientation o) { _orient = o; } - void setAlignment(KPanelExtension::Alignment a); + void tqsetAlignment(KPanelExtension::Alignment a); signals: void removeme(BaseContainer*); @@ -110,15 +110,15 @@ signals: protected: virtual void doLoadConfiguration( KConfigGroup& ) {} virtual void doSaveConfiguration( KConfigGroup&, - bool /* layoutOnly */ ) const {} - virtual void alignmentChange(KPanelExtension::Alignment) {} + bool /* tqlayoutOnly */ ) const {} + virtual void tqalignmentChange(KPanelExtension::Alignment) {} virtual TQPopupMenu* createOpMenu() = 0; TQPopupMenu *appletOpMenu() const { return _appletOpMnu; } KPanelApplet::Direction _dir; KPanelExtension::Orientation _orient; - KPanelExtension::Alignment _alignment; + KPanelExtension::Alignment _tqalignment; double _fspace; TQPoint _moveOffset; TQString _aid; diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp index bb0249843..bd1045d84 100644 --- a/kicker/kicker/core/container_button.cpp +++ b/kicker/kicker/core/container_button.cpp @@ -60,7 +60,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ButtonContainer::ButtonContainer(TQPopupMenu* opMenu, TQWidget* parent) : BaseContainer(opMenu, parent) , _button(0) - , _layout(0) + , _tqlayout(0) , _oldpos(0,0) { setBackgroundOrigin(AncestorOrigin); @@ -114,10 +114,10 @@ void ButtonContainer::configure() } } -void ButtonContainer::doSaveConfiguration(KConfigGroup& config, bool layoutOnly) const +void ButtonContainer::doSaveConfiguration(KConfigGroup& config, bool tqlayoutOnly) const { // immutability is checked by ContainerBase - if (_button && !layoutOnly) + if (_button && !tqlayoutOnly) { _button->saveConfig(config); } @@ -145,12 +145,12 @@ void ButtonContainer::embedButton(PanelButton* b) { if (!b) return; - delete _layout; - _layout = new TQVBoxLayout(this); + delete _tqlayout; + _tqlayout = new TQVBoxLayout(this); _button = b; _button->installEventFilter(this); - _layout->add(_button); + _tqlayout->add(_button); connect(_button, TQT_SIGNAL(requestSave()), TQT_SIGNAL(requestSave())); connect(_button, TQT_SIGNAL(hideme(bool)), TQT_SLOT(hideRequested(bool))); connect(_button, TQT_SIGNAL(removeme()), TQT_SLOT(removeRequested())); diff --git a/kicker/kicker/core/container_button.h b/kicker/kicker/core/container_button.h index 78b4d4ab1..7050f9cb6 100644 --- a/kicker/kicker/core/container_button.h +++ b/kicker/kicker/core/container_button.h @@ -68,14 +68,14 @@ protected slots: void dragButton(const TQPixmap icon); protected: - virtual void doSaveConfiguration( KConfigGroup&, bool layoutOnly ) const; + virtual void doSaveConfiguration( KConfigGroup&, bool tqlayoutOnly ) const; void embedButton(PanelButton* p); TQPopupMenu* createOpMenu(); void checkImmutability(const KConfigGroup&); protected: PanelButton *_button; - TQLayout *_layout; + TQLayout *_tqlayout; TQPoint _oldpos; }; diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 52e85bd7e..6a1455f3e 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -139,11 +139,11 @@ void ExtensionContainer::init() _popupWidgetFilter = new PopupWidgetFilter( this ); connect(_popupWidgetFilter, TQT_SIGNAL(popupWidgetHiding()), TQT_SLOT(maybeStartAutoHideTimer())); - // layout - _layout = new TQGridLayout(this, 3, 3, 0, 0); - _layout->setResizeMode(TQLayout::FreeResize); - _layout->setRowStretch(1,10); - _layout->setColStretch(1,10); + // tqlayout + _tqlayout = new TQGridLayout(this, 3, 3, 0, 0); + _tqlayout->setResizeMode(TQLayout::FreeResize); + _tqlayout->setRowStretch(1,10); + _tqlayout->setColStretch(1,10); // instantiate the autohide timer _autohideTimer = new TQTimer(this, "_autohideTimer"); @@ -198,7 +198,7 @@ void ExtensionContainer::init() connect(m_extension, TQT_SIGNAL(maintainFocus(bool)), TQT_SLOT(maintainFocus(bool))); - _layout->addWidget(m_extension, 1, 1); + _tqlayout->addWidget(m_extension, 1, 1); } if (!m_settings.iExist()) @@ -212,7 +212,7 @@ ExtensionContainer::~ExtensionContainer() { } -TQSize ExtensionContainer::sizeHint(KPanelExtension::Position p, const TQSize &maxSize) const +TQSize ExtensionContainer::tqsizeHint(KPanelExtension::Position p, const TQSize &maxSize) const { int width = 0; int height = 0; @@ -234,7 +234,7 @@ TQSize ExtensionContainer::sizeHint(KPanelExtension::Position p, const TQSize &m } // don't forget we might have a border! - width += _layout->colSpacing(0) + _layout->colSpacing(2); + width += _tqlayout->colSpacing(0) + _tqlayout->colSpacing(2); } else { @@ -254,7 +254,7 @@ TQSize ExtensionContainer::sizeHint(KPanelExtension::Position p, const TQSize &m } // don't forget we might have a border! - height += _layout->rowSpacing(0) + _layout->rowSpacing(2); + height += _tqlayout->rowSpacing(0) + _tqlayout->rowSpacing(2); } TQSize size(width, height); @@ -262,7 +262,7 @@ TQSize ExtensionContainer::sizeHint(KPanelExtension::Position p, const TQSize &m if (m_extension) { - size = m_extension->sizeHint(p, maxSize - size) + size; + size = m_extension->tqsizeHint(p, maxSize - size) + size; } return size.boundedTo(maxSize); @@ -293,7 +293,7 @@ void ExtensionContainer::readConfig() } positionChange(position()); - alignmentChange(alignment()); + tqalignmentChange(tqalignment()); setSize(static_cast<KPanelExtension::Size>(m_settings.size()), m_settings.customSize()); @@ -471,7 +471,7 @@ void ExtensionContainer::moveMe() KPanelExtension::Right, KPanelExtension::Top, KPanelExtension::Bottom }; - KPanelExtension::Alignment alignments[] = { KPanelExtension::LeftTop, + KPanelExtension::Alignment tqalignments[] = { KPanelExtension::LeftTop, KPanelExtension::Center, KPanelExtension::RightBottom }; @@ -482,26 +482,26 @@ void ExtensionContainer::moveMe() for (int j = 0; j < 3; j++) { // FIXME: - // asking for initial geometry here passes bogus heightForWidth + // asking for initial tqgeometry here passes bogus heightForWidth // and widthForHeight requests to applets and buttons. if they - // need to make layout adjustments or need to calculate based + // need to make tqlayout adjustments or need to calculate based // on other parameters this can lead to Bad Things(tm) // // we need to find a way to do this that doesn't result in - // sizeHint's getting called on the extension =/ + // tqsizeHint's getting called on the extension =/ // // or else we need to change the semantics for applets so that // they don't get their "you're changing position" signals through // heightForWidth/widthForHeight rects.append(UserRectSel::PanelStrut(initialGeometry(positions[i], - alignments[j], s), - s, positions[i], alignments[j])); + tqalignments[j], s), + s, positions[i], tqalignments[j])); } } } UserRectSel::PanelStrut newStrut = UserRectSel::select(rects, rect().center(), m_highlightColor); - arrange(newStrut.m_pos, newStrut.m_alignment, newStrut.m_screen); + arrange(newStrut.m_pos, newStrut.m_tqalignment, newStrut.m_screen); _is_lmb_down = false; @@ -532,7 +532,7 @@ void ExtensionContainer::updateLayout() return; } - // don't update our layout more than once every half a second... + // don't update our tqlayout more than once every half a second... if (_in_autohide) { // ... unless we are autohiding @@ -556,12 +556,12 @@ void ExtensionContainer::enableMouseOverEffects() KickerTip::enableTipping(true); TQPoint globalPos = TQCursor::pos(); TQPoint localPos = mapFromGlobal(globalPos); - TQWidget* child = childAt(localPos); + TQWidget* child = tqchildAt(localPos); if (child) { TQMouseEvent* e = new TQMouseEvent(TQEvent::Enter, localPos, globalPos, 0, 0); - qApp->sendEvent(child, e); + tqApp->sendEvent(child, e); } } @@ -657,16 +657,16 @@ void ExtensionContainer::unhideTriggered(UnhideTrigger::Trigger tr, int Xinerama // Otherwise hide mode is automatic. The code below is slightly // complex so as to keep the same behavior as it has always had: - // only unhide when the cursor position is within the widget geometry. - // We can't just do geometry().contains(TQCursor::pos()) because + // only unhide when the cursor position is within the widget tqgeometry. + // We can't just do tqgeometry().tqcontains(TQCursor::pos()) because // now we hide the panel completely off screen. int x = TQCursor::pos().x(); int y = TQCursor::pos().y(); - int t = geometry().top(); - int b = geometry().bottom(); - int r = geometry().right(); - int l = geometry().left(); + int t = tqgeometry().top(); + int b = tqgeometry().bottom(); + int r = tqgeometry().right(); + int l = tqgeometry().left(); if (((tr == UnhideTrigger::Top || tr == UnhideTrigger::TopLeft || tr == UnhideTrigger::TopRight) && @@ -730,9 +730,9 @@ void ExtensionContainer::autoHideTimeout() return; } - TQRect r = geometry(); + TQRect r = tqgeometry(); TQPoint p = TQCursor::pos(); - if (!r.contains(p) && + if (!r.tqcontains(p) && (m_settings.unhideLocation() == UnhideTrigger::None || !shouldUnhideForTrigger(m_unhideTriggeredAt))) { @@ -766,7 +766,7 @@ void ExtensionContainer::autoHide(bool hide) blockUserInput(true); TQPoint oldpos = pos(); - TQRect newextent = initialGeometry( position(), alignment(), xineramaScreen(), hide, Unhidden ); + TQRect newextent = initialGeometry( position(), tqalignment(), xineramaScreen(), hide, Unhidden ); TQPoint newpos = newextent.topLeft(); if (hide) @@ -781,7 +781,7 @@ void ExtensionContainer::autoHide(bool hide) * letting them show reveal buttons onscreen */ TQRect desktopGeom = TQApplication::desktop()->screenGeometry(s); if (desktopGeom.intersects(newextent) && - !desktopGeom.intersects(geometry())) + !desktopGeom.intersects(tqgeometry())) { blockUserInput( false ); return; @@ -821,8 +821,8 @@ void ExtensionContainer::autoHide(bool hide) move(oldpos.x() - i, newpos.y()); } - qApp->syncX(); - qApp->processEvents(); + tqApp->syncX(); + tqApp->processEvents(); } } else @@ -839,8 +839,8 @@ void ExtensionContainer::autoHide(bool hide) move(newpos.x(), oldpos.y() - i); } - qApp->syncX(); - qApp->processEvents(); + tqApp->syncX(); + tqApp->processEvents(); } } } @@ -878,7 +878,7 @@ void ExtensionContainer::animatedHide(bool left) } TQPoint oldpos = pos(); - TQRect newextent = initialGeometry(position(), alignment(), xineramaScreen(), false, newState); + TQRect newextent = initialGeometry(position(), tqalignment(), xineramaScreen(), false, newState); TQPoint newpos(newextent.topLeft()); if (newState != Unhidden) @@ -891,7 +891,7 @@ void ExtensionContainer::animatedHide(bool left) * panels from hiding by sliding onto other screens, while still * letting them show reveal buttons onscreen */ if (TQApplication::desktop()->screenGeometry(s).intersects(newextent) && - !TQApplication::desktop()->screenGeometry(s).intersects(geometry())) + !TQApplication::desktop()->screenGeometry(s).intersects(tqgeometry())) { blockUserInput(false); TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects())); @@ -920,8 +920,8 @@ void ExtensionContainer::animatedHide(bool left) { move(newpos.x(), oldpos.y() - i); } - qApp->syncX(); - qApp->processEvents(); + tqApp->syncX(); + tqApp->processEvents(); } } else @@ -937,8 +937,8 @@ void ExtensionContainer::animatedHide(bool left) { move(oldpos.x() - i, newpos.y()); } - qApp->syncX(); - qApp->processEvents(); + tqApp->syncX(); + tqApp->processEvents(); } } } @@ -948,8 +948,8 @@ void ExtensionContainer::animatedHide(bool left) _userHidden = newState; actuallyUpdateLayout(); - qApp->syncX(); - qApp->processEvents(); + tqApp->syncX(); + tqApp->processEvents(); // save our hidden status so that when kicker starts up again // we'll come back in the same state @@ -965,11 +965,11 @@ bool ExtensionContainer::reserveStrut() const return !m_extension || m_extension->reserveStrut(); } -KPanelExtension::Alignment ExtensionContainer::alignment() const +KPanelExtension::Alignment ExtensionContainer::tqalignment() const { // KConfigXT really needs to get support for vars that are enums that // are defined in other classes - return static_cast<KPanelExtension::Alignment>(m_settings.alignment()); + return static_cast<KPanelExtension::Alignment>(m_settings.tqalignment()); } void ExtensionContainer::updateWindowManager() @@ -983,8 +983,8 @@ void ExtensionContainer::updateWindowManager() int w = 0; int h = 0; - TQRect geom = initialGeometry(position(), alignment(), xineramaScreen()); - TQRect virtRect(TQApplication::desktop()->geometry()); + TQRect geom = initialGeometry(position(), tqalignment(), xineramaScreen()); + TQRect virtRect(TQApplication::desktop()->tqgeometry()); TQRect screenRect(TQApplication::desktop()->screenGeometry(xineramaScreen())); if (m_hideMode == ManualHide && !userHidden()) @@ -1087,7 +1087,7 @@ void ExtensionContainer::strutChanged() //kdDebug(1210) << "PanelContainer::strutChanged()" << endl; TQRect ig = currentGeometry(); - if (ig != geometry()) + if (ig != tqgeometry()) { setGeometry(ig); updateLayout(); @@ -1106,11 +1106,11 @@ void ExtensionContainer::blockUserInput( bool block ) // eventfilter discard those events. if ( block ) { - qApp->installEventFilter( this ); + tqApp->installEventFilter( this ); } else { - qApp->removeEventFilter( this ); + tqApp->removeEventFilter( this ); } _block_user_input = block; @@ -1170,11 +1170,11 @@ void ExtensionContainer::maintainFocus(bool maintain) int ExtensionContainer::arrangeHideButtons() { - bool layoutEnabled = _layout->isEnabled(); + bool tqlayoutEnabled = _tqlayout->isEnabled(); - if (layoutEnabled) + if (tqlayoutEnabled) { - _layout->setEnabled(false); + _tqlayout->setEnabled(false); } if (orientation() == Vertical) @@ -1190,16 +1190,16 @@ int ExtensionContainer::arrangeHideButtons() { _ltHB->setMaximumWidth(maxWidth); _ltHB->setMaximumHeight(14); - _layout->remove(_ltHB); - _layout->addWidget(_ltHB, 0, 1, Qt::AlignBottom | Qt::AlignLeft); + _tqlayout->remove(_ltHB); + _tqlayout->addWidget(_ltHB, 0, 1, Qt::AlignBottom | Qt::AlignLeft); } if (_rbHB) { _rbHB->setMaximumWidth(maxWidth); _rbHB->setMaximumHeight(14); - _layout->remove(_rbHB); - _layout->addWidget(_rbHB, 2, 1); + _tqlayout->remove(_rbHB); + _tqlayout->addWidget(_rbHB, 2, 1); } } else @@ -1218,14 +1218,14 @@ int ExtensionContainer::arrangeHideButtons() { _ltHB->setMaximumHeight(maxHeight); _ltHB->setMaximumWidth(14); - _layout->remove(_ltHB); + _tqlayout->remove(_ltHB); if (kapp->reverseLayout()) { - _layout->addWidget(_ltHB, 1, 2, vertAlignment); + _tqlayout->addWidget(_ltHB, 1, 2, vertAlignment); } else { - _layout->addWidget(_ltHB, 1, 0, leftAlignment | vertAlignment); + _tqlayout->addWidget(_ltHB, 1, 0, leftAlignment | vertAlignment); } } @@ -1233,57 +1233,57 @@ int ExtensionContainer::arrangeHideButtons() { _rbHB->setMaximumHeight(maxHeight); _rbHB->setMaximumWidth(14); - _layout->remove(_rbHB); + _tqlayout->remove(_rbHB); if (kapp->reverseLayout()) { - _layout->addWidget(_rbHB, 1, 0, leftAlignment | vertAlignment); + _tqlayout->addWidget(_rbHB, 1, 0, leftAlignment | vertAlignment); } else { - _layout->addWidget(_rbHB, 1, 2, vertAlignment); + _tqlayout->addWidget(_rbHB, 1, 2, vertAlignment); } } } - int layoutOffset = setupBorderSpace(); - if (layoutEnabled) + int tqlayoutOffset = setupBorderSpace(); + if (tqlayoutEnabled) { - _layout->setEnabled(true); + _tqlayout->setEnabled(true); } - return layoutOffset; + return tqlayoutOffset; } int ExtensionContainer::setupBorderSpace() { - _layout->setRowSpacing(0, 0); - _layout->setRowSpacing(2, 0); - _layout->setColSpacing(0, 0); - _layout->setColSpacing(2, 0); + _tqlayout->setRowSpacing(0, 0); + _tqlayout->setRowSpacing(2, 0); + _tqlayout->setColSpacing(0, 0); + _tqlayout->setColSpacing(2, 0); if (!needsBorder()) { return 0; } - int layoutOffset = 0; + int tqlayoutOffset = 0; TQRect r = TQApplication::desktop()->screenGeometry(xineramaScreen()); - TQRect h = geometry(); + TQRect h = tqgeometry(); if (orientation() == Vertical) { if (h.top() > 0) { int topHeight = (_ltHB && _ltHB->isVisibleTo(this)) ? _ltHB->height() + 1 : 1; - _layout->setRowSpacing(0, topHeight); - ++layoutOffset; + _tqlayout->setRowSpacing(0, topHeight); + ++tqlayoutOffset; } if (h.bottom() < r.bottom()) { int bottomHeight = (_rbHB && _rbHB->isVisibleTo(this)) ? _rbHB->height() + 1 : 1; - _layout->setRowSpacing(1, bottomHeight); - ++layoutOffset; + _tqlayout->setRowSpacing(1, bottomHeight); + ++tqlayoutOffset; } } else @@ -1291,39 +1291,39 @@ int ExtensionContainer::setupBorderSpace() if (h.left() > 0) { int leftWidth = (_ltHB && _ltHB->isVisibleTo(this)) ? _ltHB->width() + 1 : 1; - _layout->setColSpacing(0, leftWidth); - ++layoutOffset; + _tqlayout->setColSpacing(0, leftWidth); + ++tqlayoutOffset; } if (h.right() < r.right()) { int rightWidth = (_rbHB && _rbHB->isVisibleTo(this)) ? _rbHB->width() + 1 : 1; - _layout->setColSpacing(1, rightWidth); - ++layoutOffset; + _tqlayout->setColSpacing(1, rightWidth); + ++tqlayoutOffset; } } switch (position()) { case KPanelExtension::Left: - _layout->setColSpacing(2, 1); + _tqlayout->setColSpacing(2, 1); break; case KPanelExtension::Right: - _layout->setColSpacing(0, 1); + _tqlayout->setColSpacing(0, 1); break; case KPanelExtension::Top: - _layout->setRowSpacing(2, 1); + _tqlayout->setRowSpacing(2, 1); break; case KPanelExtension::Bottom: default: - _layout->setRowSpacing(0, 1); + _tqlayout->setRowSpacing(0, 1); break; } - return layoutOffset; + return tqlayoutOffset; } void ExtensionContainer::positionChange(KPanelExtension::Position p) @@ -1368,14 +1368,14 @@ void ExtensionContainer::leaveEvent(TQEvent*) maybeStartAutoHideTimer(); } -void ExtensionContainer::alignmentChange(KPanelExtension::Alignment a) +void ExtensionContainer::tqalignmentChange(KPanelExtension::Alignment a) { if (!m_extension) { return; } - m_extension->setAlignment(a); + m_extension->tqsetAlignment(a); } void ExtensionContainer::setSize(KPanelExtension::Size size, int custom) @@ -1437,8 +1437,8 @@ void ExtensionContainer::setHideButtons(bool showLeft, bool showRight) bool ExtensionContainer::event(TQEvent* e) { - // Update the layout when we receive a LayoutHint. This way we can adjust - // to changes of the layout of the main widget. + // Update the tqlayout when we receive a LayoutHint. This way we can adjust + // to changes of the tqlayout of the main widget. if (e->type() == TQEvent::LayoutHint) { updateLayout(); @@ -1458,7 +1458,7 @@ void ExtensionContainer::arrange(KPanelExtension::Position p, int XineramaScreen) { if (p == m_settings.position() && - a == m_settings.alignment() && + a == m_settings.tqalignment() && XineramaScreen == xineramaScreen()) { return; @@ -1471,18 +1471,18 @@ void ExtensionContainer::arrange(KPanelExtension::Position p, } else if (!needsBorder()) { - // this ensures that the layout gets rejigged + // this ensures that the tqlayout gets rejigged // even if position doesn't change - _layout->setRowSpacing(0, 0); - _layout->setRowSpacing(2, 0); - _layout->setColSpacing(0, 0); - _layout->setColSpacing(2, 0); + _tqlayout->setRowSpacing(0, 0); + _tqlayout->setRowSpacing(2, 0); + _tqlayout->setColSpacing(0, 0); + _tqlayout->setColSpacing(2, 0); } - if (a != m_settings.alignment()) + if (a != m_settings.tqalignment()) { - m_settings.setAlignment(a); - setAlignment(a); + m_settings.tqsetAlignment(a); + tqsetAlignment(a); } if (XineramaScreen != xineramaScreen()) @@ -1521,22 +1521,22 @@ KPanelExtension::Position ExtensionContainer::position() const void ExtensionContainer::resetLayout() { - TQRect g = initialGeometry(position(), alignment(), xineramaScreen(), + TQRect g = initialGeometry(position(), tqalignment(), xineramaScreen(), autoHidden(), userHidden()); - // Disable the layout while we rearrange the panel. + // Disable the tqlayout while we rearrange the panel. // Necessary because the children may be - // relayouted with the wrong size. + // retqlayouted with the wrong size. - _layout->setEnabled(false); + _tqlayout->setEnabled(false); - if (geometry() != g) + if (tqgeometry() != g) { setGeometry(g); ExtensionManager::the()->extensionSizeChanged(this); } - // layout + // tqlayout bool haveToArrangeButtons = false; bool showLeftHideButton = m_settings.showLeftHideButton() || userHidden() == RightBottom; bool showRightHideButton = m_settings.showRightHideButton() || userHidden() == LeftTop; @@ -1685,7 +1685,7 @@ void ExtensionContainer::resetLayout() } } - _layout->setEnabled(true); + _tqlayout->setEnabled(true); } bool ExtensionContainer::needsBorder() const @@ -1700,7 +1700,7 @@ TQSize ExtensionContainer::initialSize(KPanelExtension::Position p, TQRect workA ", " << workArea.topLeft().y() << ") to (" << workArea.bottomRight().x() << ", " << workArea.bottomRight().y() << ")" << endl;*/ - TQSize hint = sizeHint(p, workArea.size()).boundedTo(workArea.size()); + TQSize hint = tqsizeHint(p, workArea.size()).boundedTo(workArea.size()); int width = 0; int height = 0; @@ -1739,7 +1739,7 @@ TQPoint ExtensionContainer::initialLocation(KPanelExtension::Position p, TQRect wholeScreen; if (XineramaScreen == XineramaAllScreens) { - wholeScreen = TQApplication::desktop()->geometry(); + wholeScreen = TQApplication::desktop()->tqgeometry(); } else { @@ -1920,12 +1920,12 @@ void ExtensionContainer::setXineramaScreen(int screen) return; } - arrange(position(),alignment(), screen); + arrange(position(),tqalignment(), screen); } TQRect ExtensionContainer::currentGeometry() const { - return initialGeometry(position(), alignment(), xineramaScreen(), + return initialGeometry(position(), tqalignment(), xineramaScreen(), autoHidden(), userHidden()); } @@ -1937,7 +1937,7 @@ TQRect ExtensionContainer::initialGeometry(KPanelExtension::Position p, { //RESEARCH: is there someway to cache the results of the repeated calls to this method? - /*kdDebug(1210) << "initialGeometry() Computing geometry for " << name() << + /*kdDebug(1210) << "initialGeometry() Computing tqgeometry for " << name() << " on screen " << XineramaScreen << endl;*/ TQRect workArea = ExtensionManager::the()->workArea(XineramaScreen, this); TQSize size = initialSize(p, workArea); diff --git a/kicker/kicker/core/container_extension.h b/kicker/kicker/core/container_extension.h index 8eedd4e6f..2da239d7b 100644 --- a/kicker/kicker/core/container_extension.h +++ b/kicker/kicker/core/container_extension.h @@ -66,7 +66,7 @@ public: TQWidget *parent = 0); virtual ~ExtensionContainer(); - virtual TQSize sizeHint(KPanelExtension::Position, const TQSize &maxSize) const; + virtual TQSize tqsizeHint(KPanelExtension::Position, const TQSize &maxSize) const; const AppletInfo& info() const { return _info; } @@ -86,7 +86,7 @@ public: KPanelExtension::Orientation orientation() const; KPanelExtension::Position position() const; - void setPosition(KPanelExtension::Position p) { arrange( p, alignment(), xineramaScreen() ); } + void setPosition(KPanelExtension::Position p) { arrange( p, tqalignment(), xineramaScreen() ); } int xineramaScreen() const; void setXineramaScreen(int screen); @@ -100,8 +100,8 @@ public: void unhideIfHidden(int showForHowManyMS = 0); bool reserveStrut() const; - KPanelExtension::Alignment alignment() const; - void setAlignment(KPanelExtension::Alignment a) { arrange( position(), a, xineramaScreen() ); } + KPanelExtension::Alignment tqalignment() const; + void tqsetAlignment(KPanelExtension::Alignment a) { arrange( position(), a, xineramaScreen() ); } TQRect currentGeometry() const; TQRect initialGeometry(KPanelExtension::Position p, KPanelExtension::Alignment a, @@ -159,7 +159,7 @@ private: int XineramaScreen, const TQSize &s, TQRect workArea, bool autohidden = false, UserHidden userHidden = Unhidden) const; void positionChange(KPanelExtension::Position p); - void alignmentChange(KPanelExtension::Alignment a); + void tqalignmentChange(KPanelExtension::Alignment a); void xineramaScreenChange(int /*XineramaScreen*/) {} int arrangeHideButtons(); int setupBorderSpace(); @@ -190,7 +190,7 @@ private: // Widgets HideButton *_ltHB; // Left Hide Button HideButton *_rbHB; // Right Hide Button - TQGridLayout *_layout; + TQGridLayout *_tqlayout; KPanelExtension *m_extension; int m_maintainFocus; diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index 8fd839a20..bd596f214 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/kicker/kicker/core/containerarea.cpp @@ -88,7 +88,7 @@ ContainerArea::ContainerArea(KConfig* _c, m_canAddContainers(true), m_immutable(_c->isImmutable()), m_updateBackgroundsCalled(false), - m_layout(0), + m_tqlayout(0), m_addAppletDialog(0), _autoScrollTimer(0, "ContainerArea::autoScrollTimer") { @@ -96,9 +96,9 @@ ContainerArea::ContainerArea(KConfig* _c, m_contents = viewport(); - m_layout = new ContainerAreaLayout(m_contents); + m_tqlayout = new ContainerAreaLayout(m_contents); - // Install an event filter to propagate layout hints coming from m_contents. + // Install an event filter to propagate tqlayout hints coming from m_contents. m_contents->installEventFilter(this); setBackground(); @@ -123,7 +123,7 @@ void ContainerArea::initialize(bool useDefaultConfig) // do we really need to do this? removeAllContainers(); - // restore applet layout or load a default panel layout + // restore applet tqlayout or load a default panel tqlayout _config->setGroup("General"); if (_config->hasKey("Applets2")) { @@ -380,7 +380,7 @@ void ContainerArea::loadContainers(const TQStringList& containers) TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground())); } -void ContainerArea::saveContainerConfig(bool layoutOnly) +void ContainerArea::saveContainerConfig(bool tqlayoutOnly) { if (!canAddContainers()) { @@ -389,14 +389,14 @@ void ContainerArea::saveContainerConfig(bool layoutOnly) // Save the applet list TQStringList alist; - TQLayoutIterator it2 = m_layout->iterator(); + TQLayoutIterator it2 = m_tqlayout->iterator(); for (; it2.current(); ++it2) { BaseContainer* a = dynamic_cast<BaseContainer*>(it2.current()->widget()); if (a) { KConfigGroup group(_config, a->appletId().latin1()); - a->saveConfiguration(group, layoutOnly); + a->saveConfiguration(group, tqlayoutOnly); alist.append(a->appletId()); } } @@ -700,22 +700,22 @@ void ContainerArea::addContainer(BaseContainer* a, bool arrange, int index) if (arrange) { - TQWidget* w = m_layout->widgetAt(index); + TQWidget* w = m_tqlayout->widgetAt(index); TQPoint oldInsertionPoint = Kicker::the()->insertionPoint(); if (w) { // let's set the insertion point to where the widget asked to be // put in front of is - Kicker::the()->setInsertionPoint(w->geometry().topLeft()); + Kicker::the()->setInsertionPoint(w->tqgeometry().topLeft()); } if (Kicker::the()->insertionPoint().isNull()) { - m_layout->insertIntoFreeSpace(a, TQPoint()); + m_tqlayout->insertIntoFreeSpace(a, TQPoint()); } else { - m_layout->insertIntoFreeSpace(a, mapFromGlobal(Kicker::the()->insertionPoint())); + m_tqlayout->insertIntoFreeSpace(a, mapFromGlobal(Kicker::the()->insertionPoint())); } if (w) @@ -725,7 +725,7 @@ void ContainerArea::addContainer(BaseContainer* a, bool arrange, int index) } else { - m_layout->add(a); + m_tqlayout->add(a); } connect(a, TQT_SIGNAL(moveme(BaseContainer*)), @@ -758,7 +758,7 @@ bool ContainerArea::removeContainer(BaseContainer *a) a->slotRemoved(_config); m_containers.remove(a); - m_layout->remove(a); + m_tqlayout->remove(a); a->deleteLater(); saveContainerConfig(true); resizeContents(); @@ -772,7 +772,7 @@ bool ContainerArea::removeContainer(int index) return false; } - BaseContainer* a = dynamic_cast<BaseContainer*>(m_layout->widgetAt(index)); + BaseContainer* a = dynamic_cast<BaseContainer*>(m_tqlayout->widgetAt(index)); if (!a || a->isImmutable()) { return false; @@ -780,7 +780,7 @@ bool ContainerArea::removeContainer(int index) a->slotRemoved(_config); m_containers.remove(a); - m_layout->remove(a); + m_tqlayout->remove(a); a->deleteLater(); saveContainerConfig(true); resizeContents(); @@ -794,7 +794,7 @@ void ContainerArea::removeContainers(BaseContainer::List containers) return; } - m_layout->setEnabled(false); + m_tqlayout->setEnabled(false); for (BaseContainer::List::const_iterator it = containers.constBegin(); it != containers.constEnd(); @@ -808,11 +808,11 @@ void ContainerArea::removeContainers(BaseContainer::List containers) a->slotRemoved(_config); m_containers.remove(a); - m_layout->remove(a); + m_tqlayout->remove(a); a->deleteLater(); } - m_layout->setEnabled(true); + m_tqlayout->setEnabled(true); saveContainerConfig(true); resizeContents(); } @@ -840,7 +840,7 @@ void ContainerArea::takeContainer(BaseContainer* a) _config->deleteGroup(a->appletId().latin1()); _config->sync(); m_containers.remove(a); - m_layout->remove(a); + m_tqlayout->remove(a); saveContainerConfig(true); resizeContents(); } @@ -852,7 +852,7 @@ void ContainerArea::resizeContents() if (orientation() == Qt::Horizontal) { - int newWidth = m_layout->widthForHeight(h); + int newWidth = m_tqlayout->widthForHeight(h); if (newWidth > w) { resizeContents(newWidth, h); @@ -864,7 +864,7 @@ void ContainerArea::resizeContents() } else { - int newHeight = m_layout->heightForWidth(w); + int newHeight = m_tqlayout->heightForWidth(w); if (newHeight > h) { @@ -925,7 +925,7 @@ void ContainerArea::startContainerMove(BaseContainer *a) setMouseTracking(true); grabMouse(sizeAllCursor); - m_layout->setStretchEnabled(false); + m_tqlayout->setStretchEnabled(false); a->raise(); } @@ -949,7 +949,7 @@ void ContainerArea::mouseReleaseEvent(TQMouseEvent *) _moveAC = 0; emit maintainFocus(false); - m_layout->setStretchEnabled(true); + m_tqlayout->setStretchEnabled(true); updateContainersBackground(); saveContainerConfig(true); } @@ -962,7 +962,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev) return; } - if (ev->state() == LeftButton && !rect().contains(ev->pos())) + if (ev->state() == LeftButton && !rect().tqcontains(ev->pos())) { // leaveEvent() doesn't work, while grabbing the mouse _autoScrollTimer.stop(); @@ -974,7 +974,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev) KickerTip::enableTipping(true); emit maintainFocus(false); - m_layout->setStretchEnabled(true); + m_tqlayout->setStretchEnabled(true); updateContainersBackground(); saveContainerConfig(true); @@ -992,19 +992,19 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev) int x = ev->pos().x() + contentsX(); if (ev->state() & ShiftButton) { - m_layout->moveContainerPush(_moveAC, x - oldX); + m_tqlayout->moveContainerPush(_moveAC, x - oldX); } else { - m_layout->moveContainerSwitch(_moveAC, x - oldX); + m_tqlayout->moveContainerSwitch(_moveAC, x - oldX); /* FIXME: Scrolling when the container moves out of the viewport bool scroll = false; if (rtl) if (newPos - 80 <= 0) scroll = true; else - if (newPos + 80 >= (horizontal ? geometry().width() - moving->geometry().width() - : geometry().height() - moving->geometry().height())) + if (newPos + 80 >= (horizontal ? tqgeometry().width() - moving->tqgeometry().width() + : tqgeometry().height() - moving->tqgeometry().height())) scroll = true; [...] if (scroll) { @@ -1025,11 +1025,11 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev) int y = ev->pos().y() + contentsY(); if (ev->state() & ShiftButton) { - m_layout->moveContainerPush(_moveAC, y - oldY); + m_tqlayout->moveContainerPush(_moveAC, y - oldY); } else { - m_layout->moveContainerSwitch(_moveAC, y - oldY); + m_tqlayout->moveContainerSwitch(_moveAC, y - oldY); // TODO: Scrolling } } @@ -1066,7 +1066,7 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev) return; } - m_layout->setStretchEnabled(false); + m_tqlayout->setStretchEnabled(false); if (!_dragIndicator) { @@ -1139,17 +1139,17 @@ void ContainerArea::dragMoveEvent(TQDragMoveEvent* ev) TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_Escape, 0, 0); TQApplication::sendEvent(this, &fakedKeyPress); TQApplication::sendEvent(this, &fakedKeyRelease); - qApp->processEvents(); + tqApp->processEvents(); startContainerMove(_moveAC); // Align the container to the mouse position. if (orientation() == Horizontal) { - m_layout->moveContainerSwitch(_moveAC, ev->pos().x() + contentsX() - _moveAC->x()); + m_tqlayout->moveContainerSwitch(_moveAC, ev->pos().x() + contentsX() - _moveAC->x()); } else { - m_layout->moveContainerSwitch(_moveAC, ev->pos().y() + contentsY() - _moveAC->y()); + m_tqlayout->moveContainerSwitch(_moveAC, ev->pos().y() + contentsY() - _moveAC->y()); } return; } @@ -1175,7 +1175,7 @@ void ContainerArea::dragLeaveEvent(TQDragLeaveEvent*) { _dragIndicator->hide(); } - m_layout->setStretchEnabled(true); + m_tqlayout->setStretchEnabled(true); _dragMoveAC = 0; } @@ -1196,7 +1196,7 @@ void ContainerArea::dropEvent(TQDropEvent *ev) { _dragMoveAC = 0; _dragIndicator->hide(); - m_layout->setStretchEnabled(true); + m_tqlayout->setStretchEnabled(true); return; } @@ -1213,19 +1213,19 @@ void ContainerArea::dropEvent(TQDropEvent *ev) { int oldX = a->x(); int x = _dragIndicator->x(); - m_layout->moveContainerSwitch(a, x - oldX); + m_tqlayout->moveContainerSwitch(a, x - oldX); } else if (orientation() == Vertical) { int oldY = a->y(); int y = _dragIndicator->y(); - m_layout->moveContainerSwitch(a, y - oldY); + m_tqlayout->moveContainerSwitch(a, y - oldY); } _dragMoveAC = 0; _dragIndicator->hide(); - m_layout->setEnabled(true); - m_layout->setStretchEnabled(true); + m_tqlayout->setEnabled(true); + m_tqlayout->setStretchEnabled(true); saveContainerConfig(true); return; } @@ -1236,10 +1236,10 @@ void ContainerArea::dropEvent(TQDropEvent *ev) a->setAppletId(createUniqueId(a->appletType())); addContainer(a, true); Kicker::the()->setInsertionPoint(TQPoint()); - m_layout->updateFreeSpaceValues(); + m_tqlayout->updateFreeSpaceValues(); _dragMoveAC = 0; _dragIndicator->hide(); - m_layout->setStretchEnabled(true); + m_tqlayout->setStretchEnabled(true); saveContainerConfig(); return; } @@ -1250,7 +1250,7 @@ void ContainerArea::dropEvent(TQDropEvent *ev) { Kicker::the()->setInsertionPoint(_dragIndicator->pos()); _dragIndicator->hide(); - m_layout->setStretchEnabled(true); + m_tqlayout->setStretchEnabled(true); if (info.type() & AppletInfo::Button) { @@ -1271,7 +1271,7 @@ void ContainerArea::dropEvent(TQDropEvent *ev) { _dragMoveAC = 0; _dragIndicator->hide(); - m_layout->setStretchEnabled(true); + m_tqlayout->setStretchEnabled(true); return; } @@ -1366,32 +1366,32 @@ void ContainerArea::dropEvent(TQDropEvent *ev) { _dragIndicator->hide(); Kicker::the()->setInsertionPoint(TQPoint()); - m_layout->setStretchEnabled(true); + m_tqlayout->setStretchEnabled(true); return; } addContainer(a, true); - m_layout->updateFreeSpaceValues(); + m_tqlayout->updateFreeSpaceValues(); } saveContainerConfig(); _dragMoveAC = 0; _dragIndicator->hide(); Kicker::the()->setInsertionPoint(TQPoint()); - m_layout->setStretchEnabled(true); + m_tqlayout->setStretchEnabled(true); } bool ContainerArea::eventFilter(TQObject* o, TQEvent* e) { - // Propagate the layout hints which m_contents receives. This way widgets - // which contain a ContainerArea can react to layout changes of its + // Propagate the tqlayout hints which m_contents receives. This way widgets + // which contain a ContainerArea can react to tqlayout changes of its // contents. For example: If an applets grows, the top level widget may // want to grow as well. if (o == m_contents) { if (e->type() == TQEvent::LayoutHint) { - updateGeometry(); // Posts a new layout hint to our parent. + updateGeometry(); // Posts a new tqlayout hint to our parent. } return false; } @@ -1430,7 +1430,7 @@ void ContainerArea::setBackground() if (KickerSettings::transparent() && (KickerSettings::menubarPanelTransparent() || - !ExtensionManager::the()->isMenuBar(topLevelWidget()))) + !ExtensionManager::the()->isMenuBar(tqtopLevelWidget()))) { if (!_rootPixmap) { @@ -1441,7 +1441,7 @@ void ContainerArea::setBackground() } else { - _rootPixmap->repaint(true); + _rootPixmap->tqrepaint(true); } double tint = double(KickerSettings::tintValue()) / 100; @@ -1633,7 +1633,7 @@ void ContainerArea::moveDragIndicator(int pos) void ContainerArea::updateBackground( const TQPixmap& pm ) { - TQBrush bgBrush(colorGroup().background(), pm); + TQBrush bgBrush(tqcolorGroup().background(), pm); TQPalette pal = kapp->palette(); pal.setBrush(TQColorGroup::Background, bgBrush); setPalette(pal); @@ -1678,12 +1678,12 @@ void ContainerArea::setPosition(KPanelExtension::Position p) p == KPanelExtension::Bottom) ? Qt::Horizontal : Qt::Vertical; bool orientationChanged = (orientation() != o); - m_layout->setEnabled(false); + m_tqlayout->setEnabled(false); if (orientationChanged) { setOrientation(o); - m_layout->setOrientation(o); + m_tqlayout->setOrientation(o); // when we change orientation, we will resize the "width" // component down to 0, forcing a resize in resizeContents() @@ -1712,23 +1712,23 @@ void ContainerArea::setPosition(KPanelExtension::Position p) (*it)->setPopupDirection( popupDirection() ); } - m_layout->setEnabled(true); + m_tqlayout->setEnabled(true); setContentsPos(0, 0); m_contents->move(0, 0); setBackground(); - // container extension repaints for us! - //repaint(); + // container extension tqrepaints for us! + //tqrepaint(); } -void ContainerArea::setAlignment(KPanelExtension::Alignment a) +void ContainerArea::tqsetAlignment(KPanelExtension::Alignment a) { for (BaseContainer::ConstIterator it = m_containers.begin(); it != m_containers.end(); ++it) { - (*it)->setAlignment(a); + (*it)->tqsetAlignment(a); } } @@ -1778,21 +1778,21 @@ void ContainerArea::updateContainersBackground() // A rather ugly hack. The code calls updateContainersBackground() all over // the place even when nothing in fact has changed. Updating the background // on every single unrelated change however means that e.g. the systray - // flickers when a new window is opened/closed (because the taskbar is relayouted, - // which triggers updateContainersBackground() even though the geometry + // flickers when a new window is opened/closed (because the taskbar is retqlayouted, + // which triggers updateContainersBackground() even though the tqgeometry // of the taskbar does not change in fact. I'm apparently unable to fix this - // properly, so just cache the geometry and update background only when - // the geometry changes or when the background really changes (in which + // properly, so just cache the tqgeometry and update background only when + // the tqgeometry changes or when the background really changes (in which // case the cached is cleared). - if( !m_cachedGeometry.contains( *it )) + if( !m_cachedGeometry.tqcontains( *it )) { m_cachedGeometry[ *it ] = TQRect(); connect( *it, TQT_SIGNAL( destroyed()), TQT_SLOT( destroyCachedGeometry())); } - if( m_cachedGeometry[ *it ] != (*it)->geometry()) + if( m_cachedGeometry[ *it ] != (*it)->tqgeometry()) { (*it)->setBackground(); - m_cachedGeometry[ *it ] = (*it)->geometry(); + m_cachedGeometry[ *it ] = (*it)->tqgeometry(); } } } @@ -1891,12 +1891,12 @@ int ContainerArea::containerCount(const TQString& type) const TQStringList ContainerArea::listContainers() const { - return m_layout->listItems(); + return m_tqlayout->listItems(); } -void ContainerArea::repaint() +void ContainerArea::tqrepaint() { - Panner::repaint(); + Panner::tqrepaint(); } void ContainerArea::showAddAppletDialog() @@ -1932,12 +1932,12 @@ const TQPixmap* ContainerArea::completeBackgroundPixmap() const int ContainerArea::widthForHeight(int h) const { - return m_layout->widthForHeight(h); + return m_tqlayout->widthForHeight(h); } int ContainerArea::heightForWidth(int w) const { - return m_layout->heightForWidth(w); + return m_tqlayout->heightForWidth(w); } @@ -1952,8 +1952,8 @@ void DragIndicator::paintEvent(TQPaintEvent*) { TQPainter painter(this); TQRect rect(0, 0, width(), height()); - style().drawPrimitive( TQStyle::PE_FocusRect, &painter, rect, colorGroup(), - TQStyle::Style_Default, colorGroup().base() ); + style().drawPrimitive( TQStyle::PE_FocusRect, &painter, rect, tqcolorGroup(), + TQStyle::Style_Default, tqcolorGroup().base() ); } void DragIndicator::mousePressEvent(TQMouseEvent*) diff --git a/kicker/kicker/core/containerarea.h b/kicker/kicker/core/containerarea.h index a43cd8c9c..fc8d1a402 100644 --- a/kicker/kicker/core/containerarea.h +++ b/kicker/kicker/core/containerarea.h @@ -101,9 +101,9 @@ public slots: void removeContainers(BaseContainer::List containers); void takeContainer(BaseContainer* a); void setPosition(KPanelExtension::Position p); - void setAlignment(KPanelExtension::Alignment a); + void tqsetAlignment(KPanelExtension::Alignment a); void slotSaveContainerConfig(); - void repaint(); + void tqrepaint(); void showAddAppletDialog(); void addAppletDialogDone(); @@ -124,7 +124,7 @@ protected: void defaultContainerConfig(); void loadContainers(const TQStringList& containers); - void saveContainerConfig(bool layoutOnly = false); + void saveContainerConfig(bool tqlayoutOnly = false); TQRect availableSpaceFollowing(BaseContainer*); void moveDragIndicator(int pos); @@ -166,7 +166,7 @@ private: bool m_updateBackgroundsCalled; TQWidget* m_contents; - ContainerAreaLayout* m_layout; + ContainerAreaLayout* m_tqlayout; AddAppletDialog* m_addAppletDialog; TQMap< TQWidget*, TQRect > m_cachedGeometry; }; diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp index 4ae63077e..feed4b59f 100644 --- a/kicker/kicker/core/containerarealayout.cpp +++ b/kicker/kicker/core/containerarealayout.cpp @@ -58,11 +58,11 @@ class ContainerAreaLayoutIterator : public QGLayoutIterator ContainerAreaLayout::ItemList::iterator b = m_list->at(m_idx); if (b != m_list->end()) { - ContainerAreaLayoutItem* layoutItem = *b; - item = layoutItem->item; - layoutItem->item = 0; + ContainerAreaLayoutItem* tqlayoutItem = *b; + item = tqlayoutItem->item; + tqlayoutItem->item = 0; m_list->erase(b); - delete layoutItem; + delete tqlayoutItem; } return item; } @@ -82,7 +82,7 @@ int ContainerAreaLayoutItem::heightForWidth(int w) const } else { - return item->sizeHint().height(); + return item->tqsizeHint().height(); } } @@ -95,7 +95,7 @@ int ContainerAreaLayoutItem::widthForHeight(int h) const } else { - return item->sizeHint().width(); + return item->tqsizeHint().width(); } } @@ -125,17 +125,17 @@ void ContainerAreaLayoutItem::setFreeSpaceRatio(double ratio) Qt::Orientation ContainerAreaLayoutItem::orientation() const { - return m_layout->orientation(); + return m_tqlayout->orientation(); } -TQRect ContainerAreaLayoutItem::geometryR() const +TQRect ContainerAreaLayoutItem::tqgeometryR() const { - return m_layout->transform(geometry()); + return m_tqlayout->transform(tqgeometry()); } void ContainerAreaLayoutItem::setGeometryR(const TQRect& r) { - setGeometry(m_layout->transform(r)); + setGeometry(m_tqlayout->transform(r)); } int ContainerAreaLayoutItem::widthForHeightR(int h) const @@ -154,11 +154,11 @@ int ContainerAreaLayoutItem::widthR() const { if (orientation() == Horizontal) { - return geometry().width(); + return tqgeometry().width(); } else { - return geometry().height(); + return tqgeometry().height(); } } @@ -166,11 +166,11 @@ int ContainerAreaLayoutItem::heightR() const { if (orientation() == Horizontal) { - return geometry().height(); + return tqgeometry().height(); } else { - return geometry().width(); + return tqgeometry().width(); } } @@ -179,13 +179,13 @@ int ContainerAreaLayoutItem::leftR() const if (orientation() == Horizontal) { if (TQApplication::reverseLayout()) - return m_layout->geometry().right() - geometry().right(); + return m_tqlayout->tqgeometry().right() - tqgeometry().right(); else - return geometry().left(); + return tqgeometry().left(); } else { - return geometry().top(); + return tqgeometry().top(); } } @@ -194,13 +194,13 @@ int ContainerAreaLayoutItem::rightR() const if (orientation() == Horizontal) { if (TQApplication::reverseLayout()) - return m_layout->geometry().right() - geometry().left(); + return m_tqlayout->tqgeometry().right() - tqgeometry().left(); else - return geometry().right(); + return tqgeometry().right(); } else { - return geometry().bottom(); + return tqgeometry().bottom(); } } @@ -311,10 +311,10 @@ void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertio } } - TQRect geom = item->geometryR(); + TQRect geom = item->tqgeometryR(); geom.moveLeft(insPos); item->setGeometryR(geom); - widget->setGeometry(transform(geom)); // widget isn't shown, layout not active yet + widget->setGeometry(transform(geom)); // widget isn't shown, tqlayout not active yet if (current) { @@ -384,7 +384,7 @@ TQWidget* ContainerAreaLayout::widgetAt(int index) const return m_items[index]->item->widget(); } -TQSize ContainerAreaLayout::sizeHint() const +TQSize ContainerAreaLayout::tqsizeHint() const { const int size = KickerLib::sizeValue(KPanelExtension::SizeSmall); @@ -398,7 +398,7 @@ TQSize ContainerAreaLayout::sizeHint() const } } -TQSize ContainerAreaLayout::minimumSize() const +TQSize ContainerAreaLayout::tqminimumSize() const { const int size = KickerLib::sizeValue(KPanelExtension::SizeTiny); @@ -566,7 +566,7 @@ void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance) break; // Move 'next' to the other side of 'moving'. - TQRect geom = next->geometryR(); + TQRect geom = next->tqgeometryR(); if (forward) geom.moveLeft(geom.left() - moving->widthR()); else @@ -630,7 +630,7 @@ void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance) } // Move the container to its new position and prevent it from moving outside the panel. - TQRect geom = moving->geometryR(); + TQRect geom = moving->tqgeometryR(); distance = kClamp(newPos, 0, widthR() - moving->widthR()); geom.moveLeft(distance); moving->setGeometryR(geom); @@ -645,7 +645,7 @@ void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance) if(AppletContainer* applet = dynamic_cast<AppletContainer*>(container)) if( applet->info().desktopFile() == "menuapplet.desktop" ) { - TQRect geom = (*it)->geometryR(); + TQRect geom = (*it)->tqgeometryR(); if( prev != m_items.constEnd()) geom.moveLeft( (*prev)->rightR() + 1 ); else @@ -662,7 +662,7 @@ int ContainerAreaLayout::moveContainerPush(TQWidget* a, int distance) const bool horizontal = orientation() == Horizontal; const bool reverseLayout = TQApplication::reverseLayout(); - // Get the iterator 'it' pointing to the layoutitem representing 'a'. + // Get the iterator 'it' pointing to the tqlayoutitem representing 'a'. ItemList::const_iterator it = m_items.constBegin(); while (it != m_items.constEnd() && (*it)->item->widget() != a) { @@ -721,7 +721,7 @@ int ContainerAreaLayout::moveContainerPushRecursive(ItemList::const_iterator it, moved = forward ? kMin(distance, available) : kMax(distance, available); - TQRect geom = cur->geometryR(); + TQRect geom = cur->tqgeometryR(); geom.moveLeft(geom.left() + moved); cur->setGeometryR(geom); @@ -735,7 +735,7 @@ TQRect ContainerAreaLayout::transform(const TQRect& r) const if (TQApplication::reverseLayout()) { TQRect t = r; - t.moveLeft(geometry().right() - r.right()); + t.moveLeft(tqgeometry().right() - r.right()); return t; } else @@ -765,11 +765,11 @@ int ContainerAreaLayout::widthR() const { if (orientation() == Horizontal) { - return geometry().width(); + return tqgeometry().width(); } else { - return geometry().height(); + return tqgeometry().height(); } } @@ -777,27 +777,27 @@ int ContainerAreaLayout::heightR() const { if (orientation() == Horizontal) { - return geometry().height(); + return tqgeometry().height(); } else { - return geometry().width(); + return tqgeometry().width(); } } int ContainerAreaLayout::leftR() const { if (orientation() == Horizontal) - return geometry().left(); + return tqgeometry().left(); else - return geometry().top(); + return tqgeometry().top(); } int ContainerAreaLayout::rightR() const { if (orientation() == Horizontal) - return geometry().right(); + return tqgeometry().right(); else - return geometry().bottom(); + return tqgeometry().bottom(); } diff --git a/kicker/kicker/core/containerarealayout.h b/kicker/kicker/core/containerarealayout.h index 995497268..01bbb40d5 100644 --- a/kicker/kicker/core/containerarealayout.h +++ b/kicker/kicker/core/containerarealayout.h @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#ifndef __containerarealayout_h__ -#define __containerarealayout_h__ +#ifndef __containerareatqlayout_h__ +#define __containerareatqlayout_h__ #include <tqlayout.h> @@ -31,10 +31,10 @@ class ContainerAreaLayout; class ContainerAreaLayoutItem : public Qt { public: - ContainerAreaLayoutItem(TQLayoutItem* i, ContainerAreaLayout* layout) + ContainerAreaLayoutItem(TQLayoutItem* i, ContainerAreaLayout* tqlayout) : item(i), m_freeSpaceRatio(0.0), - m_layout(layout) + m_tqlayout(tqlayout) {} ~ContainerAreaLayoutItem() @@ -45,18 +45,18 @@ class ContainerAreaLayoutItem : public Qt bool isStretch() const; - TQRect geometry() const - { return item->geometry(); } - void setGeometry(const TQRect& geometry) - { item->setGeometry(geometry); } + TQRect tqgeometry() const + { return item->tqgeometry(); } + void setGeometry(const TQRect& tqgeometry) + { item->setGeometry(tqgeometry); } double freeSpaceRatio() const; void setFreeSpaceRatio(double ratio); Orientation orientation() const; - // Relative geometry - TQRect geometryR() const; + // Relative tqgeometry + TQRect tqgeometryR() const; void setGeometryR(const TQRect&); int widthForHeightR(int w) const; int widthR() const; @@ -68,7 +68,7 @@ class ContainerAreaLayoutItem : public Qt private: double m_freeSpaceRatio; - ContainerAreaLayout* m_layout; + ContainerAreaLayout* m_tqlayout; }; class ContainerAreaLayout : public QLayout @@ -83,8 +83,8 @@ class ContainerAreaLayout : public QLayout void insertIntoFreeSpace(TQWidget* item, TQPoint insertionPoint); TQStringList listItems() const; TQWidget* widgetAt(int index) const; - TQSize sizeHint() const; - TQSize minimumSize() const; + TQSize tqsizeHint() const; + TQSize tqminimumSize() const; TQLayoutIterator iterator(); void setGeometry(const TQRect& rect); @@ -100,7 +100,7 @@ class ContainerAreaLayout : public QLayout void moveContainerSwitch(TQWidget* container, int distance); int moveContainerPush(TQWidget* container, int distance); - // Relative geometry + // Relative tqgeometry TQRect transform(const TQRect&) const; int widthForHeightR(int w) const; int widthR() const; diff --git a/kicker/kicker/core/extensionSettings.kcfg b/kicker/kicker/core/extensionSettings.kcfg index 89d60b05a..19d282088 100644 --- a/kicker/kicker/core/extensionSettings.kcfg +++ b/kicker/kicker/core/extensionSettings.kcfg @@ -22,7 +22,7 @@ </entry> <entry name="Alignment" type="Int" > - <label>The alignment of the panel</label> + <label>The tqalignment of the panel</label> <default code="true">KPanelExtension::Left</default> <min>0</min> <max>2</max> diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp index e0f68ce8a..bec297eb9 100644 --- a/kicker/kicker/core/extensionmanager.cpp +++ b/kicker/kicker/core/extensionmanager.cpp @@ -371,7 +371,7 @@ void ExtensionManager::updateMenubar() KMenuBar tmpmenu; tmpmenu.insertItem("KDE Rocks!"); m_menubarPanel->setSize(KPanelExtension::SizeCustom, - tmpmenu.sizeHint().height()); + tmpmenu.tqsizeHint().height()); m_menubarPanel->writeConfig(); emit desktopIconsAreaChanged(desktopIconsArea(m_menubarPanel->xineramaScreen()), @@ -403,7 +403,7 @@ void ExtensionManager::addExtension( const TQString& desktopFile ) { e->readConfig(); // as a new panel, the position will be set to the preferred position - // we just need to make sure this works with the rest of the panel layout + // we just need to make sure this works with the rest of the panel tqlayout e->setPosition(initialPanelPosition(e->position())); kdDebug(1210)<<"after e->readConfig(): pos="<<e->position()<<endl; addContainer(e); @@ -527,7 +527,7 @@ bool ExtensionManager::shouldExclude(int XineramaScreen, // 1. Exclude panels not on our Xinerama screen // 2. Exclude panels on the same side of the screen as ourselves that are above us // 3. Exclude panels on the opposite side of the screen. Breaks down if the user - // dabbles in insane layouts where a top/bottom or left/right pair overlap? + // dabbles in insane tqlayouts where a top/bottom or left/right pair overlap? // 4. Exclude panels on adjacent sides of the screen that do not overlap with us if (exclude->winId() == extension->winId()) @@ -554,26 +554,26 @@ bool ExtensionManager::shouldExclude(int XineramaScreen, { // Rule 2 Exclusion if (extension->position() == KPanelExtension::Bottom && - exclude->geometry().bottom() == extension->geometry().bottom() && - !exclude->geometry().intersects(extension->geometry())) + exclude->tqgeometry().bottom() == extension->tqgeometry().bottom() && + !exclude->tqgeometry().intersects(extension->tqgeometry())) { return false; } else if (extension->position() == KPanelExtension::Top && - exclude->geometry().top() == extension->geometry().top() && - !exclude->geometry().intersects(extension->geometry())) + exclude->tqgeometry().top() == extension->tqgeometry().top() && + !exclude->tqgeometry().intersects(extension->tqgeometry())) { return false; } else if (extension->position() == KPanelExtension::Left && - exclude->geometry().left() == extension->geometry().left() && - !exclude->geometry().intersects(extension->geometry())) + exclude->tqgeometry().left() == extension->tqgeometry().left() && + !exclude->tqgeometry().intersects(extension->tqgeometry())) { return false; } else if (extension->position() == KPanelExtension::Right && - exclude->geometry().right() == extension->geometry().right() && - !exclude->geometry().intersects(extension->geometry())) + exclude->tqgeometry().right() == extension->tqgeometry().right() && + !exclude->tqgeometry().intersects(extension->tqgeometry())) { return false; } @@ -591,28 +591,28 @@ bool ExtensionManager::shouldExclude(int XineramaScreen, // Rule 4 exclusion if (extension->position() == KPanelExtension::Bottom) { - if (exclude->geometry().bottom() > extension->geometry().top()) + if (exclude->tqgeometry().bottom() > extension->tqgeometry().top()) { return lowerInStack; } } else if (extension->position() == KPanelExtension::Top) { - if (exclude->geometry().top() < extension->geometry().bottom()) + if (exclude->tqgeometry().top() < extension->tqgeometry().bottom()) { return lowerInStack; } } else if (extension->position() == KPanelExtension::Left) { - if (exclude->geometry().left() < extension->geometry().right()) + if (exclude->tqgeometry().left() < extension->tqgeometry().right()) { return lowerInStack; } } else /* if (extension->position() == KPanelExtension::Right) */ { - if (exclude->geometry().right() > extension->geometry().left()) + if (exclude->tqgeometry().right() > extension->tqgeometry().left()) { return lowerInStack; } @@ -702,7 +702,7 @@ void ExtensionManager::reduceArea(TQRect &area, const ExtensionContainer *extens return; } - TQRect geom = extension->initialGeometry(extension->position(), extension->alignment(), + TQRect geom = extension->initialGeometry(extension->position(), extension->tqalignment(), extension->xineramaScreen()); // reduce given area (TQRect) to the space not covered by the given extension @@ -741,7 +741,7 @@ TQRect ExtensionManager::desktopIconsArea(int screen) const // This is pretty broken, mixes Xinerama and non-Xinerama multihead // and generally doesn't seem to be required anyway => ignore screen. // TQRect area = TQApplication::desktop()->screenGeometry(screen); - TQRect area = TQApplication::desktop()->geometry(); + TQRect area = TQApplication::desktop()->tqgeometry(); reduceArea(area, m_mainPanel); reduceArea(area, m_menubarPanel); diff --git a/kicker/kicker/core/extensionmanager.h b/kicker/kicker/core/extensionmanager.h index 6de7b35e1..346a3a2f2 100644 --- a/kicker/kicker/core/extensionmanager.h +++ b/kicker/kicker/core/extensionmanager.h @@ -51,7 +51,7 @@ public: int nextPanelOrder(); // return the space available for all icons on the desktop - // subtracts all panels from XineramaScreen's geometry + // subtracts all panels from XineramaScreen's tqgeometry TQRect desktopIconsArea(int xineramaScreen) const; public slots: diff --git a/kicker/kicker/core/kmenubase.ui b/kicker/kicker/core/kmenubase.ui index 1adb59b38..133ae1467 100644 --- a/kicker/kicker/core/kmenubase.ui +++ b/kicker/kicker/core/kmenubase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KMenu</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -25,7 +25,7 @@ <property name="name"> <cstring>m_search</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>20</x> <y>40</y> @@ -55,13 +55,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>52</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>52</height> @@ -82,7 +82,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <hbox> <property name="name"> @@ -129,13 +129,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -178,7 +178,7 @@ <property name="name"> <cstring>m_footer</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>20</x> <y>110</y> @@ -222,7 +222,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>10</width> <height>20</height> @@ -241,7 +241,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>90</width> <height>24</height> @@ -270,7 +270,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>14</width> <height>20</height> @@ -293,7 +293,7 @@ <functions> <function access="private" specifier="non virtual">init()</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> </includehints> diff --git a/kicker/kicker/core/menumanager.cpp b/kicker/kicker/core/menumanager.cpp index 61110de14..fad16ac42 100644 --- a/kicker/kicker/core/menumanager.cpp +++ b/kicker/kicker/core/menumanager.cpp @@ -153,11 +153,11 @@ void MenuManager::kmenuAccelActivated() TQDesktopWidget* desktop = KApplication::desktop(); TQRect r; if (desktop->numScreens() < 2) - r = desktop->geometry(); + r = desktop->tqgeometry(); else r = desktop->screenGeometry(desktop->screenNumber(TQCursor::pos())); - // kMenu->rect() is not valid before showing, use sizeHint() - p = r.center() - TQRect( TQPoint( 0, 0 ), m_kmenu->sizeHint()).center(); + // kMenu->rect() is not valid before showing, use tqsizeHint() + p = r.center() - TQRect( TQPoint( 0, 0 ), m_kmenu->tqsizeHint()).center(); m_kmenu->popup(p); // when the cursor is in the area where the menu pops up, @@ -170,8 +170,8 @@ void MenuManager::kmenuAccelActivated() { // We need the kmenu's size to place it at the right position. // We cannot rely on the popup menu's current size(), if it wasn't - // shown before, so we resize it here according to its sizeHint(). - const TQSize size = m_kmenu->sizeHint(); + // shown before, so we resize it here according to its tqsizeHint(). + const TQSize size = m_kmenu->tqsizeHint(); m_kmenu->resize(size.width(),size.height()); PanelPopupButton* button = findKButtonFor(m_kmenu->widget()); @@ -188,7 +188,7 @@ void MenuManager::kmenuAccelActivated() ext->unhideIfHidden(); // make sure it's unhidden before we use it to figure out // where to popup - qApp->processEvents(); + tqApp->processEvents(); break; } diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp index 2bd70c82b..0b96d4b1f 100644 --- a/kicker/kicker/core/panelextension.cpp +++ b/kicker/kicker/core/panelextension.cpp @@ -67,12 +67,12 @@ PanelExtension::PanelExtension(const TQString& configFile, TQWidget *parent, con setAcceptDrops(!Kicker::the()->isImmutable()); setCustomMenu(opMenu()); - TQVBoxLayout* _layout = new TQVBoxLayout(this); + TQVBoxLayout* _tqlayout = new TQVBoxLayout(this); // container area _containerArea = new ContainerArea( config(), this, opMenu() ); connect(_containerArea, TQT_SIGNAL(maintainFocus(bool)), this, TQT_SIGNAL(maintainFocus(bool))); - _layout->addWidget(_containerArea); + _tqlayout->addWidget(_containerArea); _containerArea->viewport()->installEventFilter(this); _containerArea->configure(); @@ -100,7 +100,7 @@ void PanelExtension::populateContainerArea() { _containerArea->show(); - if (ExtensionManager::the()->isMainPanel(topLevelWidget())) + if (ExtensionManager::the()->isMainPanel(tqtopLevelWidget())) { setObjId("Panel"); _containerArea->initialize(true); @@ -139,7 +139,7 @@ void PanelExtension::positionChange(Position p) _containerArea->setPosition(p); } -TQSize PanelExtension::sizeHint(Position p, TQSize maxSize) const +TQSize PanelExtension::tqsizeHint(Position p, TQSize maxSize) const { TQSize size; diff --git a/kicker/kicker/core/panelextension.h b/kicker/kicker/core/panelextension.h index c7882291f..61e6c229c 100644 --- a/kicker/kicker/core/panelextension.h +++ b/kicker/kicker/core/panelextension.h @@ -80,7 +80,7 @@ k_dcop: void configure(); // KDE4: remove, moved to Kikcker public: - TQSize sizeHint(Position, TQSize maxSize) const; + TQSize tqsizeHint(Position, TQSize maxSize) const; Position preferedPosition() const { return Bottom; } bool eventFilter( TQObject *, TQEvent * ); diff --git a/kicker/kicker/core/userrectsel.cpp b/kicker/kicker/core/userrectsel.cpp index d4b54f04a..553f5ad09 100644 --- a/kicker/kicker/core/userrectsel.cpp +++ b/kicker/kicker/core/userrectsel.cpp @@ -48,7 +48,7 @@ void UserRectSel::mouseReleaseEvent(TQMouseEvent * e) { if (e->button() == LeftButton) { - qApp->exit_loop(); + tqApp->exit_loop(); } } @@ -138,10 +138,10 @@ UserRectSel::PanelStrut UserRectSel::select(const RectList& rects, const TQPoint sel.show(); sel.grabMouse(); sel.paintCurrent(); - qApp->enter_loop(); + tqApp->enter_loop(); sel.paintCurrent(); sel.releaseMouse(); - qApp->syncX(); + tqApp->syncX(); return sel.current; } diff --git a/kicker/kicker/core/userrectsel.h b/kicker/kicker/core/userrectsel.h index 63ba47fd5..b770f7409 100644 --- a/kicker/kicker/core/userrectsel.h +++ b/kicker/kicker/core/userrectsel.h @@ -43,17 +43,17 @@ class UserRectSel : public QWidget PanelStrut() : m_screen(-1), m_pos(KPanelExtension::Bottom), - m_alignment(KPanelExtension::LeftTop) + m_tqalignment(KPanelExtension::LeftTop) { } PanelStrut(const TQRect& rect, int XineramaScreen, KPanelExtension::Position pos, - KPanelExtension::Alignment alignment) + KPanelExtension::Alignment tqalignment) : m_rect(rect), m_screen(XineramaScreen), m_pos(pos), - m_alignment(alignment) + m_tqalignment(tqalignment) { } @@ -61,7 +61,7 @@ class UserRectSel : public QWidget { return m_screen == rhs.m_screen && m_pos == rhs.m_pos && - m_alignment == rhs.m_alignment; + m_tqalignment == rhs.m_tqalignment; } bool operator!=(const PanelStrut& rhs) @@ -72,7 +72,7 @@ class UserRectSel : public QWidget TQRect m_rect; int m_screen; KPanelExtension::Position m_pos; - KPanelExtension::Alignment m_alignment; + KPanelExtension::Alignment m_tqalignment; }; typedef TQValueVector<PanelStrut> RectList; diff --git a/kicker/kicker/interfaces/kickoff-search-plugin.h b/kicker/kicker/interfaces/kickoff-search-plugin.h index e91d079e7..497ed0e2b 100644 --- a/kicker/kicker/interfaces/kickoff-search-plugin.h +++ b/kicker/kicker/interfaces/kickoff-search-plugin.h @@ -82,7 +82,7 @@ public: TQString quotedPath () const { - return uri.path ().replace ('"', "\\\""); + return uri.path ().tqreplace ('"', "\\\""); } }; diff --git a/kicker/kicker/kicker-3.4-reverseLayout.cpp b/kicker/kicker/kicker-3.4-reverseLayout.cpp index 97a35aff6..bc3baa9e1 100644 --- a/kicker/kicker/kicker-3.4-reverseLayout.cpp +++ b/kicker/kicker/kicker-3.4-reverseLayout.cpp @@ -88,7 +88,7 @@ int main(int argc, char** argv) applets[*it].freeSpace = 1 - applets[*it].freeSpace; // Take care of stretchable applets. - if (stretchableApplets.contains(applets[*it].desktopFile)) + if (stretchableApplets.tqcontains(applets[*it].desktopFile)) { if (it != appletIds.begin()) { diff --git a/kicker/kicker/plugins/beaglesearch.cpp b/kicker/kicker/plugins/beaglesearch.cpp index 9f86c8fbd..f75f719ab 100644 --- a/kicker/kicker/plugins/beaglesearch.cpp +++ b/kicker/kicker/plugins/beaglesearch.cpp @@ -347,7 +347,7 @@ BeagleUtil::timestringToBeagleTimestamp(TQString timestring) //kdDebug () << "datetime string:" << timestring << endl; // FIXME: error check timestring format if (timestring.isNull () || timestring.stripWhiteSpace () == "" || timestring.length() != 8 ) - return beagle_timestamp_new_from_unix_time (TQDateTime::currentDateTime ().toTime_t ()); + return beagle_timestamp_new_from_unix_time (TQDateTime::tqcurrentDateTime ().toTime_t ()); //TQDateTime dt = TQDateTime::fromString (timestring, Qt::ISODate); struct tm tm_time; time_t timet_time; diff --git a/kicker/kicker/plugins/kickoff-beagle-plugin.cpp b/kicker/kicker/plugins/kickoff-beagle-plugin.cpp index 3cad77ca4..aed74ed43 100644 --- a/kicker/kicker/plugins/kickoff-beagle-plugin.cpp +++ b/kicker/kicker/plugins/kickoff-beagle-plugin.cpp @@ -315,7 +315,7 @@ HitMenuItem *KickoffBeaglePlugin::hitToHitMenuItem (int category, Hit *hit) case WEBHIST: uri = hit->getUri (); title = (*hit) [dc_title]; - title = title.replace(TQRegExp("\n")," "); + title = title.tqreplace(TQRegExp("\n")," "); mimetype = "text/html"; if (title.isEmpty () || title.stripWhiteSpace ().isEmpty ()) { title = uri.prettyURL (); diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp index 796920ed4..72c4f6be9 100644 --- a/kicker/kicker/ui/addapplet.cpp +++ b/kicker/kicker/ui/addapplet.cpp @@ -289,9 +289,9 @@ void AddAppletDialog::resizeAppletView() for (int i = 0; i < 3; i++) { - m_appletBox->layout()->activate(); + m_appletBox->tqlayout()->activate(); w = v->visibleWidth(); - h = m_appletBox->layout()->minimumSize().height(); + h = m_appletBox->tqlayout()->tqminimumSize().height(); v->resizeContents(w, QMAX(h, v->visibleHeight())); if (w == m_appletBox->width() && h == m_appletBox->height()) break; @@ -314,8 +314,8 @@ void AddAppletDialog::populateApplets() m_appletBox->setPaletteBackgroundColor(KGlobalSettings::baseColor()); m_mainWidget->appletScrollView->addChild(m_appletBox, 0, 0); m_appletBox->show(); - TQVBoxLayout* layout = new TQVBoxLayout(m_appletBox); - layout->setMargin(0); + TQVBoxLayout* tqlayout = new TQVBoxLayout(m_appletBox); + tqlayout->setMargin(0); m_mainWidget->appletScrollView->installEventFilter(this); @@ -367,7 +367,7 @@ void AddAppletDialog::populateApplets() itemWidget->hide(); } - layout->insertWidget(i, itemWidget); + tqlayout->insertWidget(i, itemWidget); m_appletWidgetList.append(itemWidget); setTabOrder(prevTabWidget, itemWidget); prevTabWidget = itemWidget; @@ -456,7 +456,7 @@ void AddAppletDialog::addApplet(AppletWidget* applet) if (appletContainer) { ExtensionContainer* ec = - dynamic_cast<ExtensionContainer*>(m_containerArea->topLevelWidget()); + dynamic_cast<ExtensionContainer*>(m_containerArea->tqtopLevelWidget()); if (ec) { @@ -484,8 +484,8 @@ bool AddAppletDialog::appletMatchesSearch(const AppletWidget* w, return (m_selectedType == AppletInfo::Undefined || w->info().type() & m_selectedType) && - (w->info().name().contains(s, false) || - w->info().comment().contains(s, false)); + (w->info().name().tqcontains(s, false) || + w->info().comment().tqcontains(s, false)); } void AddAppletDialog::delayedSearch() diff --git a/kicker/kicker/ui/addapplet_mnu.cpp b/kicker/kicker/ui/addapplet_mnu.cpp index 6d5c4482f..19bbf0f11 100644 --- a/kicker/kicker/ui/addapplet_mnu.cpp +++ b/kicker/kicker/ui/addapplet_mnu.cpp @@ -54,11 +54,11 @@ void PanelAddAppletMenu::slotAboutToShow() if (ai.icon().isEmpty() || ai.icon() == "unknown") { - insertItem(ai.name().replace( "&", "&&" ), i); + insertItem(ai.name().tqreplace( "&", "&&" ), i); } else { - insertItem(SmallIconSet(ai.icon()), ai.name().replace( "&", "&&" ), i); + insertItem(SmallIconSet(ai.icon()), ai.name().tqreplace( "&", "&&" ), i); } if (ai.isUniqueApplet() && PluginManager::the()->hasInstance(ai)) diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp index acd82a066..8c6eed625 100644 --- a/kicker/kicker/ui/addappletvisualfeedback.cpp +++ b/kicker/kicker/ui/addappletvisualfeedback.cpp @@ -71,7 +71,7 @@ AddAppletVisualFeedback::AddAppletVisualFeedback(AppletWidget* widget, displayInternal(); m_destination = KickerLib::popupPosition(m_direction, this, m_target); - TQPoint startAt = widget->itemPixmap->geometry().topLeft(); + TQPoint startAt = widget->itemPixmap->tqgeometry().topLeft(); startAt = widget->itemPixmap->mapToGlobal(startAt); move(startAt); @@ -107,15 +107,15 @@ void AddAppletVisualFeedback::mousePressEvent(TQMouseEvent *) void AddAppletVisualFeedback::makeMask() { - TQPainter maskPainter(&m_mask); + TQPainter tqmaskPainter(&m_tqmask); - m_mask.fill(Qt::black); + m_tqmask.fill(Qt::black); - maskPainter.setBrush(Qt::white); - maskPainter.setPen(Qt::white); - maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), - 1600 / m_mask.rect().height()); - setMask(m_mask); + tqmaskPainter.setBrush(Qt::white); + tqmaskPainter.setPen(Qt::white); + tqmaskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(), + 1600 / m_tqmask.rect().height()); + setMask(m_tqmask); } void AddAppletVisualFeedback::displayInternal() @@ -141,8 +141,8 @@ void AddAppletVisualFeedback::displayInternal() width += textRect.width() + margin; } - // resize pixmap, mask and widget - m_mask.resize(width, height); + // resize pixmap, tqmask and widget + m_tqmask.resize(width, height); m_pixmap.resize(width, height); resize(width, height); @@ -151,13 +151,13 @@ void AddAppletVisualFeedback::displayInternal() move(KickerLib::popupPosition(m_direction, this, m_target)); } - // create and set transparency mask + // create and set transparency tqmask makeMask(); // draw background TQPainter bufferPainter(&m_pixmap); bufferPainter.setPen(Qt::black); - bufferPainter.setBrush(colorGroup().background()); + bufferPainter.setBrush(tqcolorGroup().background()); bufferPainter.drawRoundRect(0, 0, width, height, 1600 / width, 1600 / height); @@ -175,14 +175,14 @@ void AddAppletVisualFeedback::displayInternal() int textY = (height - textRect.height()) / 2; // draw text shadow - TQColorGroup cg = colorGroup(); + TQColorGroup cg = tqcolorGroup(); cg.setColor(TQColorGroup::Text, cg.background().dark(115)); int shadowOffset = TQApplication::reverseLayout() ? -1 : 1; m_richText->draw(&bufferPainter, 5 + textX + shadowOffset, textY + 1, TQRect(), cg); // draw text - cg = colorGroup(); + cg = tqcolorGroup(); m_richText->draw(&bufferPainter, 5 + textX, textY, rect(), cg); } } @@ -194,7 +194,7 @@ void AddAppletVisualFeedback::swoopCloser() return; } - TQPoint loc = geometry().topLeft(); + TQPoint loc = tqgeometry().topLeft(); bool isLeft = m_destination.x() > loc.x(); if (loc.x() != m_destination.x()) { @@ -225,7 +225,7 @@ void AddAppletVisualFeedback::swoopCloser() void AddAppletVisualFeedback::internalUpdate() { m_dirty = true; - repaint(false); + tqrepaint(false); } #include "addappletvisualfeedback.moc" diff --git a/kicker/kicker/ui/addappletvisualfeedback.h b/kicker/kicker/ui/addappletvisualfeedback.h index 02899ee36..f4ac90213 100644 --- a/kicker/kicker/ui/addappletvisualfeedback.h +++ b/kicker/kicker/ui/addappletvisualfeedback.h @@ -62,7 +62,7 @@ class AddAppletVisualFeedback : QWidget private: const TQWidget* m_target; KPanelApplet::Direction m_direction; - TQBitmap m_mask; + TQBitmap m_tqmask; TQPixmap m_pixmap; TQPixmap m_icon; TQSimpleRichText* m_richText; diff --git a/kicker/kicker/ui/addbutton_mnu.cpp b/kicker/kicker/ui/addbutton_mnu.cpp index 02c4718d4..c04a832e6 100644 --- a/kicker/kicker/ui/addbutton_mnu.cpp +++ b/kicker/kicker/ui/addbutton_mnu.cpp @@ -46,7 +46,7 @@ PanelAddButtonMenu::PanelAddButtonMenu(ContainerArea* cArea, TQWidget * parent, void PanelAddButtonMenu::slotExec(int id) { - if (!entryMap_.contains(id)) + if (!entryMap_.tqcontains(id)) return; KSycocaEntry * e = entryMap_[id]; diff --git a/kicker/kicker/ui/addextension_mnu.cpp b/kicker/kicker/ui/addextension_mnu.cpp index b22187443..325897a8c 100644 --- a/kicker/kicker/ui/addextension_mnu.cpp +++ b/kicker/kicker/ui/addextension_mnu.cpp @@ -44,7 +44,7 @@ void PanelAddExtensionMenu::slotAboutToShow() AppletInfo::List::const_iterator it = extensions.constBegin(); for( int i = 0; it != extensions.constEnd(); ++it, ++i ) { const AppletInfo& ai = (*it); - insertItem( ai.name().replace( "&", "&&" ), i ); + insertItem( ai.name().tqreplace( "&", "&&" ), i ); if ( ai.isUniqueApplet() && PluginManager::the()->hasInstance(ai) ) { setItemEnabled( i, false ); setItemChecked( i, true ); diff --git a/kicker/kicker/ui/appletitem.ui b/kicker/kicker/ui/appletitem.ui index d9cc2d9b0..32996941b 100644 --- a/kicker/kicker/ui/appletitem.ui +++ b/kicker/kicker/ui/appletitem.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>AppletItem</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -20,13 +20,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>80</height> @@ -41,7 +41,7 @@ </property> <widget class="QLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <vbox> <property name="name"> @@ -65,7 +65,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -87,7 +87,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -95,7 +95,7 @@ </widget> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <vbox> <property name="name"> @@ -105,7 +105,7 @@ <property name="name"> <cstring>itemPixmap</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>64</width> <height>64</height> @@ -117,7 +117,7 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -125,5 +125,5 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp index e0e162d33..2e0d3e405 100644 --- a/kicker/kicker/ui/appletop_mnu.cpp +++ b/kicker/kicker/ui/appletop_mnu.cpp @@ -41,7 +41,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP bool isButton = (parent && parent->inherits("ButtonContainer")); bool isMenu = false; TQString titleText = title; - titleText = titleText.replace('&', "&&"); + titleText = titleText.tqreplace('&', "&&"); if (isButton) { isMenu = static_cast<ButtonContainer*>(parent)->isAMenu(); diff --git a/kicker/kicker/ui/appletview.ui b/kicker/kicker/ui/appletview.ui index a2fa1e91b..4232b9dcc 100644 --- a/kicker/kicker/ui/appletview.ui +++ b/kicker/kicker/ui/appletview.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>AppletView</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> @@ -110,7 +110,7 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -125,7 +125,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>284</width> <height>20</height> @@ -195,7 +195,7 @@ <tabstop>appletSearch</tabstop> <tabstop>appletFilter</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>qscrollview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp index 2250475b4..e62322e35 100644 --- a/kicker/kicker/ui/browser_mnu.cpp +++ b/kicker/kicker/ui/browser_mnu.cpp @@ -104,7 +104,7 @@ void PanelBrowserMenu::initialize() setInitialized(true); // start watching if not already done - if (!_dirWatch.contains(path())) + if (!_dirWatch.tqcontains(path())) _dirWatch.addDir( path() ); // setup icon map @@ -244,7 +244,7 @@ void PanelBrowserMenu::initialize() title = c.readEntry("Name", title); TQString s = c.readEntry("Icon"); - if(!_icons->contains(s)) { + if(!_icons->tqcontains(s)) { icon = KGlobal::iconLoader()->loadIcon(s, KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState, 0, true); @@ -344,7 +344,7 @@ void PanelBrowserMenu::append(const TQPixmap &pixmap, const TQString &title, con // avoid &'s being converted to accelerators TQString newTitle = title; newTitle = KStringHandler::cEmSqueeze( newTitle, fontMetrics(), 20 ); - newTitle.replace("&", "&&"); + newTitle.tqreplace("&", "&&"); // insert menu item int id = insertItem(pixmap, newTitle); @@ -362,7 +362,7 @@ void PanelBrowserMenu::append(const TQPixmap &pixmap, const TQString &title, Pan // avoid &'s being converted to accelerators TQString newTitle = title; newTitle = KStringHandler::cEmSqueeze( newTitle, fontMetrics(), 20 ); - newTitle.replace("&", "&&"); + newTitle.tqreplace("&", "&&"); // insert submenu insertItem(pixmap, newTitle, subMenu); @@ -388,7 +388,7 @@ void PanelBrowserMenu::mouseMoveEvent(TQMouseEvent *e) // get id int id = idAt(_lastpress); - if(!_filemap.contains(id)) return; + if(!_filemap.tqcontains(id)) return; // reset _lastpress _lastpress = TQPoint(-1, -1); @@ -429,7 +429,7 @@ void PanelBrowserMenu::dragMoveEvent(TQDragMoveEvent *ev) void PanelBrowserMenu::dropEvent( TQDropEvent *ev ) { KURL u( path() ); - KFileItem item( u, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); + KFileItem item( u, TQString::tqfromLatin1( "inode/directory" ), KFileItem::Unknown ); KonqOperations::doDrop( &item, u, ev, this ); KPanelMenu::dropEvent(ev); // ### TODO: Update list @@ -439,7 +439,7 @@ void PanelBrowserMenu::slotExec(int id) { kapp->propagateSessionManager(); - if(!_filemap.contains(id)) return; + if(!_filemap.tqcontains(id)) return; KURL url; url.setPath(path() + "/" + _filemap[id]); @@ -494,9 +494,9 @@ void PanelBrowserMenu::slotMimeCheck() // kdDebug() << url.url() << ": " << icon << endl; file = KStringHandler::cEmSqueeze( file, fontMetrics(), 20 ); - file.replace("&", "&&"); + file.tqreplace("&", "&&"); - if(!_icons->contains(icon)) { + if(!_icons->tqcontains(icon)) { TQPixmap pm = SmallIcon(icon); if( pm.height() > 16 ) { @@ -514,7 +514,7 @@ void PanelBrowserMenu::slotMimeCheck() void PanelBrowserMenu::slotClear() { // no need to watch any further - if (_dirWatch.contains(path())) + if (_dirWatch.tqcontains(path())) _dirWatch.removeDir( path() ); // don't change menu if already visible diff --git a/kicker/kicker/ui/clicklineedit.cpp b/kicker/kicker/ui/clicklineedit.cpp index 52cb8776d..79f2eaf1f 100644 --- a/kicker/kicker/ui/clicklineedit.cpp +++ b/kicker/kicker/ui/clicklineedit.cpp @@ -39,13 +39,13 @@ ClickLineEdit::~ClickLineEdit() {} void ClickLineEdit::setClickMessage( const TQString &msg ) { mClickMessage = msg; - repaint(); + tqrepaint(); } void ClickLineEdit::setText( const TQString &txt ) { mDrawClickMsg = txt.isEmpty(); - repaint(); + tqrepaint(); KLineEdit::setText( txt ); } @@ -67,7 +67,7 @@ void ClickLineEdit::focusInEvent( TQFocusEvent *ev ) if ( mDrawClickMsg == true ) { mDrawClickMsg = false; - repaint(); + tqrepaint(); } TQLineEdit::focusInEvent( ev ); } @@ -77,7 +77,7 @@ void ClickLineEdit::focusOutEvent( TQFocusEvent *ev ) if ( text().isEmpty() ) { mDrawClickMsg = true; - repaint(); + tqrepaint(); } TQLineEdit::focusOutEvent( ev ); } diff --git a/kicker/kicker/ui/clicklineedit.h b/kicker/kicker/ui/clicklineedit.h index cadafae4c..8f5bacd81 100644 --- a/kicker/kicker/ui/clicklineedit.h +++ b/kicker/kicker/ui/clicklineedit.h @@ -27,7 +27,7 @@ namespace KPIM { /** - This class provides a KLineEdit which contains a greyed-out hinting + This class provides a KLineEdit which tqcontains a greyed-out hinting text as long as the user didn't enter any text @short LineEdit with customizable "Click here" text diff --git a/kicker/kicker/ui/exe_dlg.cpp b/kicker/kicker/ui/exe_dlg.cpp index cb0d42c56..4fa39c677 100644 --- a/kicker/kicker/ui/exe_dlg.cpp +++ b/kicker/kicker/ui/exe_dlg.cpp @@ -78,8 +78,8 @@ PanelExeDialog::PanelExeDialog(const TQString& title, const TQString& descriptio this, TQT_SLOT(slotIconChanged(TQString))); // leave decent space for the commandline - resize(sizeHint().width() > 300 ? sizeHint().width() : 300, - sizeHint().height()); + resize(tqsizeHint().width() > 300 ? tqsizeHint().width() : 300, + tqsizeHint().height()); } void PanelExeDialog::slotOk() @@ -174,7 +174,7 @@ void PanelExeDialog::slotTextChanged(const TQString &str) void PanelExeDialog::slotReturnPressed() { - if (m_partialPath2full.contains(ui->m_exec->url())) + if (m_partialPath2full.tqcontains(ui->m_exec->url())) ui->m_exec->setURL(m_partialPath2full[ui->m_exec->url()]); } diff --git a/kicker/kicker/ui/flipscrollview.cpp b/kicker/kicker/ui/flipscrollview.cpp index ae96ebcaa..fb5cfd422 100644 --- a/kicker/kicker/ui/flipscrollview.cpp +++ b/kicker/kicker/ui/flipscrollview.cpp @@ -57,7 +57,7 @@ void BackFrame::drawContents( TQPainter *p ) { TQColor gray( 230, 230, 230 ); if ( mouse_inside ) - p->fillRect( 3, 3, width() - 6, height() - 6, colorGroup().color( TQColorGroup::Highlight ) ); + p->fillRect( 3, 3, width() - 6, height() - 6, tqcolorGroup().color( TQColorGroup::Highlight ) ); else p->fillRect( 3, 3, width() - 6, height() - 6, gray ); p->setPen( gray.dark(110) ); @@ -270,7 +270,7 @@ void FlipScrollView::slotScrollTimer() if (!mSelectMenuPath.isEmpty()) { if (mSelectMenuPath=="kicker:/goup/") { currentView()->setSelected(currentView()->firstChild(),true); - currentView()->firstChild()->repaint(); + currentView()->firstChild()->tqrepaint(); } else { TQListViewItem * child = currentView()->firstChild(); @@ -278,8 +278,8 @@ void FlipScrollView::slotScrollTimer() KMenuItem* kitem = dynamic_cast<KMenuItem*>(child); if (kitem && kitem->menuPath()==mSelectMenuPath) { currentView()->setSelected(child,true); - kdDebug() << "child repaint\n"; - child->repaint(); + kdDebug() << "child tqrepaint\n"; + child->tqrepaint(); break; } child = child->nextSibling(); diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp index a73e0a48d..e3325bfe3 100644 --- a/kicker/kicker/ui/hidebutton.cpp +++ b/kicker/kicker/ui/hidebutton.cpp @@ -51,22 +51,22 @@ void HideButton::drawButton(TQPainter *p) { if (m_arrow == Qt::LeftArrow) { - p->setPen(colorGroup().mid()); + p->setPen(tqcolorGroup().mid()); p->drawLine(width()-1, 0, width()-1, height()); } else if (m_arrow == Qt::RightArrow) { - p->setPen(colorGroup().mid()); + p->setPen(tqcolorGroup().mid()); p->drawLine(0, 0, 0, height()); } else if (m_arrow == Qt::UpArrow) { - p->setPen(colorGroup().mid()); + p->setPen(tqcolorGroup().mid()); p->drawLine(0, height()-1, width(), height()-1); } else if (m_arrow == Qt::DownArrow) { - p->setPen(colorGroup().mid()); + p->setPen(tqcolorGroup().mid()); p->drawLine(0, 0, width(), 0); } @@ -173,14 +173,14 @@ void HideButton::slotIconChanged(int group) } generateIcons(); - repaint(false); + tqrepaint(false); } void HideButton::enterEvent(TQEvent *e) { m_highlight = true; - repaint(false); + tqrepaint(false); TQButton::enterEvent(e); } @@ -188,7 +188,7 @@ void HideButton::leaveEvent(TQEvent *e) { m_highlight = false; - repaint(false); + tqrepaint(false); TQButton::enterEvent(e); } diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp index dcb4760c1..86033ae98 100644 --- a/kicker/kicker/ui/itemview.cpp +++ b/kicker/kicker/ui/itemview.cpp @@ -99,7 +99,7 @@ static double pointSize( double pixelSize, TQPaintDevice *w ) static int pixelSize( double pixelSize, TQPaintDevice *w ) { - return qRound( pixelSize * TQPaintDevice::x11AppDpiY( w->x11Screen () ) / 72. ); + return tqRound( pixelSize * TQPaintDevice::x11AppDpiY( w->x11Screen () ) / 72. ); } void KMenuItem::init() @@ -145,7 +145,7 @@ void KMenuItem::setIcon(const TQString& icon, int size) void KMenuItem::setHasChildren( bool flag ) { m_has_children = flag; - repaint(); + tqrepaint(); } void KMenuItem::setup() @@ -166,7 +166,7 @@ void KMenuItem::setup() void KMenuItem::paintCell(TQPainter* p, const TQColorGroup & cg, int column, int width, int align) { ItemView *listview = static_cast<ItemView*>( listView() ); - int bottom = listView()->itemRect( this ).bottom(); + int bottom = listView()->tqitemRect( this ).bottom(); int diff = bottom - listView()->viewport()->height(); KPixmap pm; @@ -197,7 +197,7 @@ void KMenuItem::paintCell(TQPainter* p, const TQColorGroup & cg, int column, int else listview->m_lastOne = static_cast<KMenuItem*>( itemBelow() ); listview->m_old_contentY = -1; - repaint(); + tqrepaint(); } } } @@ -315,7 +315,7 @@ void KMenuItem::paintCellInter(TQPainter* p, const TQColorGroup & cg, int column pp.fillRect( 0, 0, off.width(), off.height(), backg ); TQColor myColor = cg.color( TQColorGroup::Text ).light( 200 ); - if ( qGray( myColor.rgb() ) == 0 ) + if ( tqGray( myColor.rgb() ) == 0 ) myColor = TQColor( 100, 100, 110 ); pp.setPen( myColor ); pp.setPen( isSelected() ? cg.color( TQColorGroup::Mid ) : myColor ); @@ -350,7 +350,7 @@ void KMenuItem::paintCellInter(TQPainter* p, const TQColorGroup & cg, int column { // the listview caches paint events m_old_width = width; - repaint(); + tqrepaint(); } } @@ -385,7 +385,7 @@ void KMenuItemSeparator::setLink( const TQString &text, const TQString &url ) bool KMenuItemSeparator::hitsLink( const TQPoint &pos ) { - return m_link_rect.contains( pos ); + return m_link_rect.tqcontains( pos ); } void KMenuItemSeparator::preparePixmap( int width ) @@ -424,7 +424,7 @@ void KMenuItemSeparator::paintCell(TQPainter* p, const TQColorGroup & cg, int co f.setPointSize( 8 + KickerSettings::kickoffFontPointSizeOffset() ); p->setFont( f ); TQColor myColor = cg.color( TQColorGroup::Text ).light( 200 ); - if ( qGray( myColor.rgb() ) == 0 ) + if ( tqGray( myColor.rgb() ) == 0 ) myColor = TQColor( 100, 100, 110 ); p->setPen( myColor ); int twidth = p->fontMetrics().width(text(0)); @@ -528,7 +528,7 @@ void KMenuItemHeader::paintCell(TQPainter* p, const TQColorGroup & cg, int , int int r = left_margin + margin * 2; const int min_font_size = 7; - int title_font_pixelSize = qRound( pixelSize( QMAX( pointSize( 12, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ), listView() ) ); + int title_font_pixelSize = tqRound( pixelSize( QMAX( pointSize( 12, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ), listView() ) ); TQFont f1 = p->font(); f1.setPixelSize( title_font_pixelSize ); @@ -608,7 +608,7 @@ void ItemViewTip::maybeTip( const TQPoint &pos ) if ( item->toolTip().isNull() ) return; - TQRect r = view->itemRect( item ); + TQRect r = view->tqitemRect( item ); int headerPos = view->header()->sectionPos( 0 ); r.setLeft( headerPos ); r.setRight( headerPos + view->header()->sectionSize( 0 ) ); @@ -762,7 +762,7 @@ void ItemView::slotMoveContent() TQListViewItemIterator it( this ); while ( it.current() ) { if ( !dynamic_cast<KMenuSpacer*>( it.current() ) && !it.current()->parent() && it.current()->isVisible() ) { - it.current()->invalidateHeight(); + it.current()->tqinvalidateHeight(); item_height += it.current()->totalHeight(); } ++it; @@ -915,7 +915,7 @@ void ItemView::contentsMousePressEvent ( TQMouseEvent * e ) KMenuItemSeparator *si = dynamic_cast<KMenuItemSeparator*>( itemAt( vp ) ); if ( si ) { - if ( si->hitsLink( vp - itemRect(si).topLeft() ) ) + if ( si->hitsLink( vp - tqitemRect(si).topLeft() ) ) emit startURL( si->linkUrl() ); } } @@ -928,7 +928,7 @@ void ItemView::contentsMouseMoveEvent(TQMouseEvent *e) bool link_cursor = false; KMenuItemSeparator *si = dynamic_cast<KMenuItemSeparator*>( i ); if ( si ) - link_cursor = si->hitsLink( vp - itemRect(si).topLeft() ); + link_cursor = si->hitsLink( vp - tqitemRect(si).topLeft() ); if (i && !i->isSelectable() && !link_cursor) { unsetCursor(); @@ -965,7 +965,7 @@ void ItemView::resizeEvent ( TQResizeEvent * e ) { KListView::resizeEvent( e ); // if ( m_lastOne ) -// int diff = itemRect( m_lastOne ).bottom() - viewport()->height(); +// int diff = tqitemRect( m_lastOne ).bottom() - viewport()->height(); } void ItemView::viewportPaintEvent ( TQPaintEvent * pe ) @@ -975,7 +975,7 @@ void ItemView::viewportPaintEvent ( TQPaintEvent * pe ) if ( m_lastOne && m_old_contentY != contentsY() ) { m_old_contentY = contentsY(); - m_lastOne->repaint(); + m_lastOne->tqrepaint(); } } @@ -1020,17 +1020,17 @@ TQDragObject * ItemView::dragObject() p.drawPixmap(pix.height()-add.height(), pix.width()-add.width(), add); p.end(); - TQBitmap mask; + TQBitmap tqmask; - if (pix.mask()) - mask = *pix.mask(); + if (pix.tqmask()) + tqmask = *pix.tqmask(); else { - mask.resize(pix.size()); - mask.fill(Qt::color1); + tqmask.resize(pix.size()); + tqmask.fill(Qt::color1); } - bitBlt( &mask, pix.width()-add.width(), pix.height()-add.height(), add.mask(), 0, 0, add.width(), add.height(), OrROP ); - pix.setMask( mask ); + bitBlt( &tqmask, pix.width()-add.width(), pix.height()-add.height(), add.tqmask(), 0, 0, add.width(), add.height(), OrROP ); + pix.setMask( tqmask ); o->setPixmap(pix); if(kitem->service()) { @@ -1052,7 +1052,7 @@ TQDragObject * ItemView::dragObject() else if(!kitem->path().isEmpty() && !kitem->path().startsWith("kicker:/") && !kitem->path().startsWith("kaddressbook:/")) { TQString uri = kitem->path(); - if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { + if (uri.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) { KDesktopFile df(uri,true); uri=df.readURL(); } @@ -1103,7 +1103,7 @@ const char * KMenuItemDrag::format(int i) const return 0; } -TQByteArray KMenuItemDrag::encodedData(const char* mimeType) const +TQByteArray KMenuItemDrag::tqencodedData(const char* mimeType) const { if (TQString("application/kmenuitem") == mimeType) return a; @@ -1138,7 +1138,7 @@ bool ItemView::acceptDrag (TQDropEvent* event) const bool KMenuItemDrag::decode(const TQMimeSource* e, KMenuItemInfo& item) { - TQByteArray a = e->encodedData("application/kmenuitem"); + TQByteArray a = e->tqencodedData("application/kmenuitem"); if (a.isEmpty()) { TQStringList l; @@ -1211,7 +1211,7 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const TQString uri = item.m_path; - if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { + if (uri.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) { KDesktopFile df(uri,true); uri=df.readURL(); } @@ -1219,7 +1219,7 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const for (it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { KDesktopFile df((*it),true); - if (df.readURL().replace("file://",TQString::null)==uri) + if (df.readURL().tqreplace("file://",TQString::null)==uri) break; } } @@ -1233,7 +1233,7 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const TQStringList favs = KickerSettings::favorites(); if (text.endsWith(".desktop")) { - KService::Ptr p = KService::serviceByDesktopPath(text.replace("file://",TQString::null)); + KService::Ptr p = KService::serviceByDesktopPath(text.tqreplace("file://",TQString::null)); return (p && favs.find(p->storageId())==favs.end()); } else { @@ -1241,7 +1241,7 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const for (it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { KDesktopFile df((*it),true); - if (df.readURL().replace("file://",TQString::null)==text) + if (df.readURL().tqreplace("file://",TQString::null)==text) break; } } diff --git a/kicker/kicker/ui/itemview.h b/kicker/kicker/ui/itemview.h index c8b95ee42..2a6b7e68b 100644 --- a/kicker/kicker/ui/itemview.h +++ b/kicker/kicker/ui/itemview.h @@ -248,7 +248,7 @@ class KMenuItemDrag : public TQDragObject ~KMenuItemDrag(); virtual const char * format(int i = 0) const; - virtual TQByteArray encodedData(const char *) const; + virtual TQByteArray tqencodedData(const char *) const; static bool canDecode(const TQMimeSource * e); static bool decode(const TQMimeSource* e, KMenuItemInfo& item); diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index 0506201f5..2b0afad5f 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -94,7 +94,7 @@ PanelKMenu::PanelKMenu() "slotServiceStartedByStorageId(TQString,TQString)", false); displayRepairTimer = new TQTimer( this ); - connect( displayRepairTimer, SIGNAL(timeout()), this, SLOT(repairDisplay()) ); + connect( displayRepairTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(repairDisplay()) ); } PanelKMenu::~PanelKMenu() @@ -125,7 +125,7 @@ void PanelKMenu::hideMenu() while (isShown() == true) kapp->eventLoop()->processEvents(1000); TQTimer *windowtimer = new TQTimer( this ); - connect( windowtimer, SIGNAL(timeout()), this, SLOT(windowClearTimeout()) ); + connect( windowtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(windowClearTimeout()) ); windowTimerTimedOut = false; windowtimer->start( 0, TRUE ); // Wait for all window system events to be processed while (windowTimerTimedOut == false) @@ -138,7 +138,7 @@ void PanelKMenu::hideMenu() // thereby removing a bad shutdown screen artifact while still providing // a somewhat snappy user interface. TQTimer *delaytimer = new TQTimer( this ); - connect( delaytimer, SIGNAL(timeout()), this, SLOT(windowClearTimeout()) ); + connect( delaytimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(windowClearTimeout()) ); windowTimerTimedOut = false; delaytimer->start( 100, TRUE ); // Wait for 100 milliseconds while (windowTimerTimedOut == false) @@ -207,7 +207,7 @@ void PanelKMenu::paletteChanged() if (!loadSidePixmap()) { sidePixmap = sideTilePixmap = TQPixmap(); - setMinimumSize( sizeHint() ); + setMinimumSize( tqsizeHint() ); } } @@ -415,10 +415,10 @@ void PanelKMenu::repairDisplay(void) { displayRepairTimer->stop(); // Now do a nasty hack to prevent search bar merging into the side image - // This forces a layout/repaint of the qpopupmenu - repaint(); // This ensures that the side bar image was applied + // This forces a tqlayout/tqrepaint of the qpopupmenu + tqrepaint(); // This ensures that the side bar image was applied styleChange(style()); // This forces a call to the private function updateSize(TRUE) inside the qpopupmenu. - update(); // This repaints the entire popup menu to apply the widget size/alignment changes made above + update(); // This tqrepaints the entire popup menu to apply the widget size/tqalignment changes made above } } @@ -579,32 +579,32 @@ void PanelKMenu::showMenu() TQRect PanelKMenu::sideImageRect() { - return TQStyle::visualRect( TQRect( frameWidth(), frameWidth(), sidePixmap.width(), + return TQStyle::tqvisualRect( TQRect( frameWidth(), frameWidth(), sidePixmap.width(), height() - 2*frameWidth() ), this ); } void PanelKMenu::resizeEvent(TQResizeEvent * e) { // kdDebug(1210) << "PanelKMenu::resizeEvent():" << endl; -// kdDebug(1210) << geometry().width() << ", " << geometry().height() << endl; +// kdDebug(1210) << tqgeometry().width() << ", " << tqgeometry().height() << endl; PanelServiceMenu::resizeEvent(e); - setFrameRect( TQStyle::visualRect( TQRect( sidePixmap.width(), 0, + setFrameRect( TQStyle::tqvisualRect( TQRect( sidePixmap.width(), 0, width() - sidePixmap.width(), height() ), this ) ); } //Workaround Qt3.3.x sizing bug, by ensuring we're always wide enough. void PanelKMenu::resize(int width, int height) { - width = kMax(width, maximumSize().width()); + width = kMax(width, tqmaximumSize().width()); PanelServiceMenu::resize(width, height); } -TQSize PanelKMenu::sizeHint() const +TQSize PanelKMenu::tqsizeHint() const { - TQSize s = PanelServiceMenu::sizeHint(); -// kdDebug(1210) << "PanelKMenu::sizeHint()" << endl; + TQSize s = PanelServiceMenu::tqsizeHint(); +// kdDebug(1210) << "PanelKMenu::tqsizeHint()" << endl; // kdDebug(1210) << s.width() << ", " << s.height() << endl; return s; } @@ -621,7 +621,7 @@ void PanelKMenu::paintEvent(TQPaintEvent * e) style().drawPrimitive( TQStyle::PE_PanelPopup, &p, TQRect( 0, 0, width(), height() ), - colorGroup(), TQStyle::Style_Default, + tqcolorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0 ) ); TQRect r = sideImageRect(); @@ -648,7 +648,7 @@ TQMouseEvent PanelKMenu::translateMouseEvent( TQMouseEvent* e ) { TQRect side = sideImageRect(); - if ( !side.contains( e->pos() ) ) + if ( !side.tqcontains( e->pos() ) ) return *e; TQPoint newpos( e->pos() ); @@ -700,7 +700,7 @@ void PanelKMenu::keyPressEvent(TQKeyEvent* e) // user presses '/'. This is the same shortcut as // konqueror is using, and afaik it's hardcoded both // here and there. This sucks badly for many non-us - // keyboard layouts, but for the sake of consistency + // keyboard tqlayouts, but for the sake of consistency // we follow konqueror. if (!searchEdit) return KPanelMenu::keyPressEvent(e); diff --git a/kicker/kicker/ui/k_mnu.h b/kicker/kicker/ui/k_mnu.h index 16655bdd6..d91ddf032 100644 --- a/kicker/kicker/ui/k_mnu.h +++ b/kicker/kicker/ui/k_mnu.h @@ -59,7 +59,7 @@ public: int insertClientMenu(KickerClientMenu *p); void removeClientMenu(int id); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; virtual void setMinimumSize(const TQSize &); virtual void setMaximumSize(const TQSize &); virtual void setMinimumSize(int, int); diff --git a/kicker/kicker/ui/k_mnu_stub.cpp b/kicker/kicker/ui/k_mnu_stub.cpp index b02d2bcbf..16e755d48 100644 --- a/kicker/kicker/ui/k_mnu_stub.cpp +++ b/kicker/kicker/ui/k_mnu_stub.cpp @@ -97,11 +97,11 @@ void KMenuStub::resize(int w, int h) return m_w.panelkmenu->resize(w, h); } -TQSize KMenuStub::sizeHint() const +TQSize KMenuStub::tqsizeHint() const { if(m_type == t_KMenu) - return m_w.kmenu->sizeHint(); - return m_w.panelkmenu->sizeHint(); + return m_w.kmenu->tqsizeHint(); + return m_w.panelkmenu->tqsizeHint(); } bool KMenuStub::highlightMenuItem( const TQString &menuId ) diff --git a/kicker/kicker/ui/k_mnu_stub.h b/kicker/kicker/ui/k_mnu_stub.h index 362d132b2..17fe92b7c 100644 --- a/kicker/kicker/ui/k_mnu_stub.h +++ b/kicker/kicker/ui/k_mnu_stub.h @@ -53,7 +53,7 @@ public: void popup(const TQPoint &pos, int indexAtPoint = -1); void selectFirstItem(); void resize(int, int); - TQSize sizeHint() const; + TQSize tqsizeHint() const; bool highlightMenuItem( const TQString &menuId ); void clearRecentMenuItems(); void initialize(); diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index a2a8cb2fc..2fc18f079 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -141,12 +141,12 @@ static TQString workaroundStringFreeze(const TQString& str) { TQString s = str; - s.replace("<u>","&"); + s.tqreplace("<u>","&"); TQRegExp re("<[^>]+>"); re.setMinimal(true); re.setCaseSensitive(false); - s.replace(re, ""); + s.tqreplace(re, ""); s = s.simplifyWhiteSpace(); return s; @@ -194,7 +194,7 @@ KMenu::KMenu() m_userInfo->setBackgroundMode( PaletteBase ); TQColor userInfoColor = TQApplication::palette().color( TQPalette::Normal, TQColorGroup::Mid ); - if ( qGray( userInfoColor.rgb() ) > 120 ) + if ( tqGray( userInfoColor.rgb() ) > 120 ) userInfoColor = userInfoColor.dark( 200 ); else userInfoColor = userInfoColor.light( 200 ); @@ -302,7 +302,7 @@ KMenu::KMenu() m_searchInternet->setPixmap(0,icon); setTabOrder(m_kcommand, m_searchResultsWidget); - m_kerryInstalled = !KStandardDirs::findExe(TQString::fromLatin1("kerry")).isEmpty(); + m_kerryInstalled = !KStandardDirs::findExe(TQString::tqfromLatin1("kerry")).isEmpty(); m_isShowing = false; if (!m_kerryInstalled) { @@ -421,7 +421,7 @@ void KMenu::setupUi() { m_stacker = new TQWidgetStack( this, "m_stacker" ); m_stacker->setGeometry( TQRect( 90, 260, 320, 220 ) ); - m_stacker->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 1, 1, m_stacker->sizePolicy().hasHeightForWidth() ) ); + m_stacker->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 1, 1, m_stacker->sizePolicy().hasHeightForWidth() ) ); m_stacker->setPaletteBackgroundColor( TQColor( 255, 255, 255 ) ); // m_stacker->setFocusPolicy( TQWidget::StrongFocus ); m_stacker->setLineWidth( 0 ); @@ -495,7 +495,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) if(raiseWidget) break; if(receiver->isWidgetType()) - receiver = static_cast<TQWidget*>(receiver)->parentWidget(true); + receiver = static_cast<TQWidget*>(receiver)->tqparentWidget(true); else break; } @@ -517,12 +517,12 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) return false; } - if (m_sloppyRegion.contains(p)) { + if (m_sloppyRegion.tqcontains(p)) { if (e->type() == TQEvent::MouseButtonPress /*&& m_sloppyTimer.isActive()*/) m_sloppySourceClicked = true; if (!m_sloppyTimer.isActive() || m_sloppySource != raiseRect) { - int timeout= style().styleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay); + int timeout= style().tqstyleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay); if (m_sloppySourceClicked) timeout = 3000; m_sloppyTimer.start(timeout); @@ -682,9 +682,9 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) void KMenu::slotSloppyTimeout() { - if (m_sloppyRegion.contains(TQCursor::pos()) && !m_sloppySource.isNull()) + if (m_sloppyRegion.tqcontains(TQCursor::pos()) && !m_sloppySource.isNull()) { - if ( m_sloppySource.contains(TQCursor::pos())) + if ( m_sloppySource.tqcontains(TQCursor::pos())) { m_stacker->raiseWidget(m_sloppyWidget); @@ -882,7 +882,7 @@ void KMenu::slotGoExitSubMenu(const TQString& url) m_exitView->rightView()->insertItem( "switchuser", i18n( "Start New Session" ), i18n( "Start a parallel session" ), "kicker:/switchuser", nId++, index++ ); - m_exitView->rightView()->insertItem( "lock", i18n( "Lock Current && Start New Session").replace("&&","&"), + m_exitView->rightView()->insertItem( "lock", i18n( "Lock Current && Start New Session").tqreplace("&&","&"), i18n( "Lock screen and start a parallel session" ), "kicker:/switchuserafterlock", nId++, index++ ); SessList sess; @@ -1259,7 +1259,7 @@ void KMenu::initialize() if ((*it)[0]=='/') { KDesktopFile df((*it),true); TQString url = df.readURL(); - if (!KURL(url).isLocalFile() || TQFile::exists(url.replace("file://",TQString::null))) + if (!KURL(url).isLocalFile() || TQFile::exists(url.tqreplace("file://",TQString::null))) m_favoriteView->insertItem(df.readIcon(),df.readName(),df.readGenericName(), url, nId++, index++); } else { @@ -1314,7 +1314,7 @@ void KMenu::insertStaticExitItems() m_exitView->leftView()->insertItem( "exit", i18n( "Shutdown Computer" ), i18n( "Turn off computer" ), "kicker:/shutdown", nId++, index++ ); - m_exitView->leftView()->insertItem( "reload", i18n( "&Restart Computer" ).replace("&",""), + m_exitView->leftView()->insertItem( "reload", i18n( "&Restart Computer" ).tqreplace("&",""), i18n( "Restart and boot the default system" ), "kicker:/restart", nId++, index++ ); @@ -1556,7 +1556,7 @@ bool KMenu::runCommand() case KURIFilterData::HELP: { // No need for kfmclient, KRun does it all (David) - (void) new KRun( m_filterData->uri(), parentWidget()); + (void) new KRun( m_filterData->uri(), tqparentWidget()); return false; } case KURIFilterData::EXECUTABLE: @@ -1699,14 +1699,14 @@ void KMenu::setOrientation(MenuOrientation orientation) TQWidget *footer = m_footer->mainWidget(); TQPixmap pix( 64, footer->height() ); TQPainter p( &pix ); - p.fillRect( 0, 0, 64, footer->height(), m_branding->colorGroup().brush( TQColorGroup::Base ) ); + p.fillRect( 0, 0, 64, footer->height(), m_branding->tqcolorGroup().brush( TQColorGroup::Base ) ); p.fillRect( 0, m_orientation == BottomUp ? footer->height() - 2 : 0, 64, 3, KNewButton::self()->borderColor() ); p.end(); footer->setPaletteBackgroundPixmap( pix ); } - resizeEvent(new TQResizeEvent(sizeHint(), sizeHint())); + resizeEvent(new TQResizeEvent(tqsizeHint(), tqsizeHint())); } void KMenu::showMenu() @@ -1762,10 +1762,10 @@ void KMenu::paintEvent(TQPaintEvent * e) const BackgroundMode bgmode = backgroundMode(); const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode ); - p.setBrush( colorGroup().brush( crole ) ); + p.setBrush( tqcolorGroup().brush( crole ) ); p.drawRect( 0, 0, width(), height() ); - int ypos = m_search->mainWidget()->geometry().bottom(); + int ypos = m_search->mainWidget()->tqgeometry().bottom(); p.drawPixmap( 0, ypos, main_border_tl ); p.drawPixmap( width() - main_border_tr.width(), ypos, main_border_tr ); @@ -1923,7 +1923,7 @@ void KMenu::createNewProgramList() m_seenPrograms = KickerSettings::firstSeenApps(); m_newInstalledPrograms.clear(); - m_currentDate = TQDate::currentDate().toString(Qt::ISODate); + m_tqcurrentDate = TQDate::tqcurrentDate().toString(Qt::ISODate); bool initialize = (m_seenPrograms.count() == 0); @@ -1964,7 +1964,7 @@ void KMenu::createNewProgramList(TQString relPath) } else if(e->isType(KST_KService)) { KService::Ptr s(static_cast<KService *>(e)); if(s->type() == "Application" && !s->noDisplay() ) { - TQString shortStorageId = s->storageId().replace(".desktop",TQString::null); + TQString shortStorageId = s->storageId().tqreplace(".desktop",TQString::null); TQStringList::Iterator it_find = m_seenPrograms.begin(); TQStringList::Iterator it_end = m_seenPrograms.end(); bool found = false; @@ -1978,7 +1978,7 @@ void KMenu::createNewProgramList(TQString relPath) if (!found) { m_seenProgramsChanged=true; m_seenPrograms+=shortStorageId; - m_seenPrograms+=m_currentDate; + m_seenPrograms+=m_tqcurrentDate; if (m_newInstalledPrograms.find(s->storageId())==m_newInstalledPrograms.end()) m_newInstalledPrograms+=s->storageId(); } @@ -1986,7 +1986,7 @@ void KMenu::createNewProgramList(TQString relPath) ++it_find; if (*(it_find)!="-") { TQDate date = TQDate::fromString(*(it_find),Qt::ISODate); - if (date.daysTo(TQDate::currentDate())<3) { + if (date.daysTo(TQDate::tqcurrentDate())<3) { if (m_newInstalledPrograms.find(s->storageId())==m_newInstalledPrograms.end()) m_newInstalledPrograms+=s->storageId(); } @@ -2540,7 +2540,7 @@ TQString KMenu::iconForHitMenuItem(HitMenuItem *hit_item) return favicon; } - if (mimetype_iconstore.contains (hit_item->mimetype)) + if (mimetype_iconstore.tqcontains (hit_item->mimetype)) return (mimetype_iconstore [hit_item->mimetype]); else { KMimeType::Ptr mimetype_ptr = KMimeType::mimeType (hit_item->mimetype); @@ -2715,7 +2715,7 @@ void KMenu::slotStartURL(const TQString& u) } kapp->propagateSessionManager(); - (void) new KRun( u, parentWidget()); + (void) new KRun( u, tqparentWidget()); } } @@ -2744,7 +2744,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos m_popupPath.path = kitem->path(); m_popupPath.icon = kitem->icon(); - if (m_popupPath.path.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { + if (m_popupPath.path.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) { KDesktopFile df(m_popupPath.path,true); m_popupPath.path=df.readURL(); } @@ -2779,7 +2779,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos if ((*it)[0]=='/') { KDesktopFile df((*it),true); - if (df.readURL().replace("file://",TQString::null)==m_popupPath.path) + if (df.readURL().tqreplace("file://",TQString::null)==m_popupPath.path) break; } } @@ -2936,7 +2936,7 @@ void KMenu::slotContextMenu(int selected) case EditMenu: accept(); proc = new KProcess(this); - *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); + *proc << KStandardDirs::findExe(TQString::tqfromLatin1("kmenuedit")); *proc << "/"+m_popupPath.menuPath.section('/',-200,-2) << m_popupPath.menuPath.section('/', -1); proc->start(); break; @@ -2982,7 +2982,7 @@ void KMenu::slotContextMenu(int selected) for (it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { KDesktopFile df((*it),true); - if (df.readURL().replace("file://",TQString::null)==m_popupPath.path) + if (df.readURL().tqreplace("file://",TQString::null)==m_popupPath.path) break; } } @@ -3024,7 +3024,7 @@ void KMenu::slotContextMenu(int selected) for (TQStringList::Iterator it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { KDesktopFile df((*it),true); - if (df.readURL().replace("file://",TQString::null)==m_popupPath.path) { + if (df.readURL().tqreplace("file://",TQString::null)==m_popupPath.path) { TQFile::remove((*it)); favs.erase(it); break; @@ -3074,24 +3074,24 @@ void KMenu::resizeEvent ( TQResizeEvent * e ) // put the search widget at the top of the menu and give it its desired // height m_search->mainWidget()->setGeometry( 0, ypos, width(), - m_search->minimumSize().height() ); - left_height -= m_search->minimumSize().height(); - ypos += m_search->minimumSize().height(); + m_search->tqminimumSize().height() ); + left_height -= m_search->tqminimumSize().height(); + ypos += m_search->tqminimumSize().height(); // place the footer widget at the bottom of the menu and give it its desired // height - m_footer->mainWidget()->setGeometry( 0, height() - m_footer->minimumSize().height(), - width(), m_footer->minimumSize().height() ); - left_height -= m_footer->minimumSize().height(); + m_footer->mainWidget()->setGeometry( 0, height() - m_footer->tqminimumSize().height(), + width(), m_footer->tqminimumSize().height() ); + left_height -= m_footer->tqminimumSize().height(); // place the button box above the footer widget, horizontal placement // has the width of the edge graphics subtracted m_tabBar->setGeometry(button_box_left.width(), - height() - m_footer->minimumSize().height() - - m_tabBar->sizeHint().height(), + height() - m_footer->tqminimumSize().height() - + m_tabBar->tqsizeHint().height(), width() - button_box_left.width(), - m_tabBar->sizeHint().height() ); - left_height -= m_tabBar->sizeHint().height(); + m_tabBar->tqsizeHint().height() ); + left_height -= m_tabBar->tqsizeHint().height(); // place the main (stacker) widget below the search widget, // in the remaining vertical space @@ -3105,28 +3105,28 @@ void KMenu::resizeEvent ( TQResizeEvent * e ) // place the 'footer' widget at the top of the menu and give it // its desired height m_footer->mainWidget()->setGeometry( 0, - ypos /*height() - m_footer->minimumSize().height()*/, + ypos /*height() - m_footer->tqminimumSize().height()*/, width(), - m_footer->minimumSize().height() ); - ypos += m_footer->minimumSize().height(); - left_height -= m_footer->minimumSize().height(); + m_footer->tqminimumSize().height() ); + ypos += m_footer->tqminimumSize().height(); + left_height -= m_footer->tqminimumSize().height(); // place the button box next at the top of the menu. // has the width of the edge graphics subtracted m_tabBar->setGeometry(button_box_left.width(), ypos, width() - button_box_left.width(), - m_tabBar->sizeHint().height()); + m_tabBar->tqsizeHint().height()); - ypos += m_tabBar->sizeHint().height(); - left_height -= m_tabBar->sizeHint().height(); + ypos += m_tabBar->tqsizeHint().height(); + left_height -= m_tabBar->tqsizeHint().height(); // put the search widget above the footer widget // height m_search->mainWidget()->setGeometry( 0, - height() - m_search->minimumSize().height(), + height() - m_search->tqminimumSize().height(), width(), - m_search->minimumSize().height() + m_search->tqminimumSize().height() ); - left_height -= m_search->minimumSize().height(); + left_height -= m_search->tqminimumSize().height(); // place the main (stacker) widget below the button box, // in the remaining vertical space @@ -3167,14 +3167,14 @@ void KMenu::mouseMoveEvent ( TQMouseEvent * e ) if ( hasMouseTracking() && m_isresizing ) { m_stacker->setMinimumSize( TQSize(0, 0) ); m_stacker->setMaximumSize( TQSize(32000, 32000) ); - int newWidth = QMAX( e->x() - x(), minimumSizeHint().width() ); + int newWidth = QMAX( e->x() - x(), tqminimumSizeHint().width() ); if ( m_orientation == BottomUp ) { - int newHeight = QMAX( height() - e->y(), minimumSizeHint().height() + 10 ); + int newHeight = QMAX( height() - e->y(), tqminimumSizeHint().height() + 10 ); int newY = y() + height() - newHeight; setGeometry( x(), newY, newWidth, newHeight); } else { - setGeometry( x(), y(), newWidth, QMAX( e->y(), minimumSizeHint().height() + 10 )); + setGeometry( x(), y(), newWidth, QMAX( e->y(), tqminimumSizeHint().height() + 10 )); } } } @@ -3277,10 +3277,10 @@ void KMenu::searchActionClicked(TQListViewItem* item) if( !KURIFilter::self()->filterURI(data, list) ) { KDesktopFile file("searchproviders/google.desktop", true, "services"); - data.setData(file.readEntry("Query").replace("\\{@}", m_kcommand->currentText())); + data.setData(file.readEntry("Query").tqreplace("\\{@}", m_kcommand->currentText())); } - (void) new KRun( data.uri(), parentWidget()); + (void) new KRun( data.uri(), tqparentWidget()); } } @@ -3320,7 +3320,7 @@ void KMenu::updateRecentlyUsedApps(KService::Ptr &service) TQString strItem(service->desktopEntryPath()); // don't add an item from root kmenu level - if (!strItem.contains('/')) + if (!strItem.tqcontains('/')) { return; } @@ -3331,36 +3331,36 @@ void KMenu::updateRecentlyUsedApps(KService::Ptr &service) RecentlyLaunchedApps::the().m_bNeedToUpdate = true; } -TQSize KMenu::sizeHint() const +TQSize KMenu::tqsizeHint() const { #warning FIXME - // this should be only for the inner area so layout changes do not break it + // this should be only for the inner area so tqlayout changes do not break it const int width = kMin(KickerSettings::kMenuWidth(), TQApplication::desktop()->screen()->width()-50); const int height = kMin(KickerSettings::kMenuHeight(), TQApplication::desktop()->screen()->height()-50); TQSize wanted(width, height); - kdDebug() << "show " << minimumSizeHint() << " " << m_stacker->minimumSizeHint() << " " - << m_searchFrame->minimumSizeHint() << " " << wanted << endl; + kdDebug() << "show " << tqminimumSizeHint() << " " << m_stacker->tqminimumSizeHint() << " " + << m_searchFrame->tqminimumSizeHint() << " " << wanted << endl; bool isDefault = wanted.isNull(); - wanted = wanted.expandedTo(minimumSizeHint()); + wanted = wanted.expandedTo(tqminimumSizeHint()); if ( isDefault ) - wanted.setHeight( wanted.height() + ( m_favoriteView->goodHeight() - m_stacker->minimumSizeHint().height() ) ); + wanted.setHeight( wanted.height() + ( m_favoriteView->goodHeight() - m_stacker->tqminimumSizeHint().height() ) ); return wanted; } -TQSize KMenu::minimumSizeHint() const +TQSize KMenu::tqminimumSizeHint() const { TQSize minsize; - minsize.setWidth( minsize.width() + m_tabBar->sizeHint().width() ); + minsize.setWidth( minsize.width() + m_tabBar->tqsizeHint().width() ); minsize.setWidth( QMAX( minsize.width(), - m_search->minimumSize().width() ) ); + m_search->tqminimumSize().width() ) ); minsize.setWidth( QMAX( minsize.width(), - m_search->minimumSize().width() ) ); + m_search->tqminimumSize().width() ) ); minsize.setHeight( minsize.height() + - m_search->minimumSize().height() + - m_footer->minimumSize().height() + + m_search->tqminimumSize().height() + + m_footer->tqminimumSize().height() + 180 ); // 180 is a very rough guess for 32 icon size return minsize; } @@ -3387,7 +3387,7 @@ void KMenu::slotFavoritesMoved( TQListViewItem* item, TQListViewItem* /*afterFir if ((*it)[0]=='/') { KDesktopFile df((*it),true); - if (df.readURL().replace("file://",TQString::null)==kitem->path()) + if (df.readURL().tqreplace("file://",TQString::null)==kitem->path()) { addFav = *it; favs.erase(it); @@ -3412,7 +3412,7 @@ void KMenu::slotFavoritesMoved( TQListViewItem* item, TQListViewItem* /*afterFir if ((*it)[0]=='/' && !kafterNow->service()) { KDesktopFile df((*it),true); - if (df.readURL().replace("file://",TQString::null)==kafterNow->path()) + if (df.readURL().tqreplace("file://",TQString::null)==kafterNow->path()) { kdDebug() << "insert after " << kafterNow->path() << endl; favs.insert(++it,addFav); @@ -3558,7 +3558,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) else { TQString uri = item.m_path; - if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { + if (uri.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) { KDesktopFile df(uri,true); uri=df.readURL(); } @@ -3569,7 +3569,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) if ((*it)[0]=='/') { KDesktopFile df((*it),true); - if (df.readURL().replace("file://",TQString::null)==uri) + if (df.readURL().tqreplace("file://",TQString::null)==uri) break; } } @@ -3597,7 +3597,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) if (text.endsWith(".desktop")) { - KService::Ptr p = KService::serviceByDesktopPath(text.replace("file://",TQString::null)); + KService::Ptr p = KService::serviceByDesktopPath(text.tqreplace("file://",TQString::null)); if (p && favs.find(p->storageId())==favs.end()) { newItem = m_favoriteView->insertMenuItem(p, serviceMenuEndId()+favs.count()+1); favs+=p->storageId(); @@ -3611,7 +3611,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) if ((*it)[0]=='/') { KDesktopFile df((*it),true); - if (df.readURL().replace("file://",TQString::null)==text) + if (df.readURL().tqreplace("file://",TQString::null)==text) break; } } diff --git a/kicker/kicker/ui/k_new_mnu.h b/kicker/kicker/ui/k_new_mnu.h index ef45ef815..73549cfa0 100644 --- a/kicker/kicker/ui/k_new_mnu.h +++ b/kicker/kicker/ui/k_new_mnu.h @@ -104,8 +104,8 @@ public: enum MaskEffect { Plain, Dissolve }; - virtual TQSize sizeHint() const; - virtual TQSize minimumSizeHint() const; + virtual TQSize tqsizeHint() const; + virtual TQSize tqminimumSizeHint() const; void searchOver(); void initCategoryTitlesUpdate(); @@ -319,7 +319,7 @@ private: TQStringList m_programsInMenu; TQStringList m_newInstalledPrograms, m_seenPrograms; bool m_seenProgramsChanged; - TQString m_currentDate; + TQString m_tqcurrentDate; MenuOrientation m_orientation; bool m_toolTipsEnabled; diff --git a/kicker/kicker/ui/kickoff_bar.cpp b/kicker/kicker/ui/kickoff_bar.cpp index 2f0de9aea..de6f3661e 100644 --- a/kicker/kicker/ui/kickoff_bar.cpp +++ b/kicker/kicker/ui/kickoff_bar.cpp @@ -56,10 +56,10 @@ void KickoffTabBar::paint(TQPainter* p, TQTab* t, bool selected) const // else if(t == d->pressed) // flags |= TQStyle::Style_Sunken; //selection flags - if(t->rect().contains(mapFromGlobal(TQCursor::pos()))) + if(t->rect().tqcontains(mapFromGlobal(TQCursor::pos()))) flags |= TQStyle::Style_MouseOver; - style().drawControl( TQStyle::CE_TabBarTab, p, this, t->rect(), - colorGroup(), flags, TQStyleOption(t) ); + style().tqdrawControl( TQStyle::CE_TabBarTab, p, this, t->rect(), + tqcolorGroup(), flags, TQStyleOption(t) ); paintLabel( p, t->rect(), t, t->identifier() == keyboardFocusTab() ); } @@ -70,7 +70,7 @@ void KickoffTabBar::paintLabel(TQPainter* p, const TQRect& br, TQTab* t, bool ha TQRect r = br; bool selected = m_tabsActivated && (currentTab() == t->identifier()); - int vframe = style().pixelMetric( TQStyle::PM_TabBarTabVSpace, this ); + int vframe = style().tqpixelMetric( TQStyle::PM_TabBarTabVSpace, this ); p->setFont( font() ); TQFontMetrics fm = p->fontMetrics(); @@ -114,30 +114,30 @@ void KickoffTabBar::paintLabel(TQPainter* p, const TQRect& br, TQTab* t, bool ha flags |= TQStyle::Style_Selected; // else if(t == d->pressed) // flags |= TQStyle::Style_Sunken; - if(t->rect().contains(mapFromGlobal(TQCursor::pos()))) + if(t->rect().tqcontains(mapFromGlobal(TQCursor::pos()))) flags |= TQStyle::Style_MouseOver; - style().drawControl( TQStyle::CE_TabBarLabel, p, this, rt, - t->isEnabled() ? colorGroup(): palette().disabled(), + style().tqdrawControl( TQStyle::CE_TabBarLabel, p, this, rt, + t->isEnabled() ? tqcolorGroup(): palette().disabled(), flags, TQStyleOption(t) ); } -TQSize KickoffTabBar::sizeHint() const +TQSize KickoffTabBar::tqsizeHint() const { - TQSize s = TQTabBar::sizeHint(); + TQSize s = TQTabBar::tqsizeHint(); return s; } -void KickoffTabBar::layoutTabs() +void KickoffTabBar::tqlayoutTabs() { - TQTabBar::layoutTabs(); + TQTabBar::tqlayoutTabs(); TQFontMetrics fm = fontMetrics(); int fh = ((KickerSettings::kickoffTabBarFormat() != KickerSettings::IconOnly) ? fm.height() : 0) + 4; - int hframe = style().pixelMetric( TQStyle::PM_TabBarTabHSpace, this ); - int vframe = style().pixelMetric( TQStyle::PM_TabBarTabVSpace, this ); - int overlap = style().pixelMetric( TQStyle::PM_TabBarTabOverlap, this ); + int hframe = style().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, this ); + int vframe = style().tqpixelMetric( TQStyle::PM_TabBarTabVSpace, this ); + int overlap = style().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, this ); TQSize s; for (int t = 0; t < count(); ++t) diff --git a/kicker/kicker/ui/kickoff_bar.h b/kicker/kicker/ui/kickoff_bar.h index 2330ffe39..67a7fcdda 100644 --- a/kicker/kicker/ui/kickoff_bar.h +++ b/kicker/kicker/ui/kickoff_bar.h @@ -32,12 +32,12 @@ public: KickoffTabBar(TQWidget* parent, const char* name); void deactivateTabs(bool b); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; protected: virtual void paint(TQPainter*, TQTab*, bool) const; virtual void paintLabel(TQPainter* p, const TQRect& br, TQTab* t, bool has_focus) const; - virtual void layoutTabs(); + virtual void tqlayoutTabs(); virtual void dragEnterEvent(TQDragEnterEvent*); virtual void dragMoveEvent(TQDragMoveEvent*); virtual void mousePressEvent ( TQMouseEvent * ); diff --git a/kicker/kicker/ui/kmenuitembase.ui b/kicker/kicker/ui/kmenuitembase.ui index 0cbea1155..64f598076 100644 --- a/kicker/kicker/ui/kmenuitembase.ui +++ b/kicker/kicker/ui/kmenuitembase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KMenuItemBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -20,13 +20,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>80</height> @@ -44,7 +44,7 @@ </property> <widget class="QLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <vbox> <property name="name"> @@ -73,7 +73,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -102,7 +102,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -110,7 +110,7 @@ </widget> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <vbox> <property name="name"> @@ -120,7 +120,7 @@ <property name="name"> <cstring>itemPixmap</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>64</width> <height>64</height> @@ -129,7 +129,7 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop|AlignHCenter</set> </property> </widget> @@ -137,5 +137,5 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kicker/kicker/ui/nonKDEButtonSettings.ui b/kicker/kicker/ui/nonKDEButtonSettings.ui index 5c44aca85..a6b5cb8ae 100644 --- a/kicker/kicker/ui/nonKDEButtonSettings.ui +++ b/kicker/kicker/ui/nonKDEButtonSettings.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>NonKDEButtonSettings</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -140,13 +140,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>58</width> <height>58</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>58</width> <height>58</height> @@ -199,7 +199,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>8</height> @@ -216,6 +216,6 @@ <tabstop>m_commandLine</tabstop> <tabstop>m_inTerm</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kicker/kicker/ui/popupmenutitle.h b/kicker/kicker/ui/popupmenutitle.h index 439fc195f..f861cbc7e 100644 --- a/kicker/kicker/ui/popupmenutitle.h +++ b/kicker/kicker/ui/popupmenutitle.h @@ -69,11 +69,11 @@ public: m_font.setBold(true); } - TQSize sizeHint() + TQSize tqsizeHint() { TQSize size = TQFontMetrics(m_font).size(AlignHCenter, m_desktopName); size.setHeight(size.height() + - (kapp->style().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1)); + (kapp->style().tqpixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1)); return size; } diff --git a/kicker/kicker/ui/removeapplet_mnu.cpp b/kicker/kicker/ui/removeapplet_mnu.cpp index 2e0543dae..3c14a74aa 100644 --- a/kicker/kicker/ui/removeapplet_mnu.cpp +++ b/kicker/kicker/ui/removeapplet_mnu.cpp @@ -63,7 +63,7 @@ void PanelRemoveAppletMenu::slotAboutToShow() } items.append(PanelMenuItemInfo(container->icon(), - container->visibleName().replace("&", "&&"), + container->visibleName().tqreplace("&", "&&"), id)); ++id; ++it; diff --git a/kicker/kicker/ui/removeextension_mnu.cpp b/kicker/kicker/ui/removeextension_mnu.cpp index 9d5d80d2b..e1d8d62c4 100644 --- a/kicker/kicker/ui/removeextension_mnu.cpp +++ b/kicker/kicker/ui/removeextension_mnu.cpp @@ -57,7 +57,7 @@ void PanelRemoveExtensionMenu::slotAboutToShow() for (ExtensionList::iterator it = m_containers.begin(); it != itEnd; ++it) { const AppletInfo info = (*it)->info(); - TQString name = info.name().replace("&", "&&"); + TQString name = info.name().tqreplace("&", "&&"); switch ((*it)->position()) { case KPanelExtension::Top: diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index 3042eddfe..2d6287bb9 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/kicker/kicker/ui/service_mnu.cpp @@ -230,8 +230,8 @@ void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root, TQString inlineHeaderName = g->showInlineHeader() ? groupCaption : ""; // Item names may contain ampersands. To avoid them being converted - // to accelerators, replace them with two ampersands. - groupCaption.replace("&", "&&"); + // to accelerators, tqreplace them with two ampersands. + groupCaption.tqreplace("&", "&&"); if ( nbChildCount == 1 && g->allowInline() && g->inlineAlias()) { @@ -411,7 +411,7 @@ void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId, if (KickerSettings::menuEntryFormat() == KickerSettings::NameAndDescription) { if ((!suppressGenericNames || - !suppressGenericNames->contains(s->untranslatedGenericName())) && + !suppressGenericNames->tqcontains(s->untranslatedGenericName())) && serviceName.find(comment, 0, true) == -1) { if (comment.find(serviceName, 0, true) == -1) @@ -449,8 +449,8 @@ void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId, return; // item names may contain ampersands. To avoid them being converted - // to accelerators, replace them with two ampersands. - serviceName.replace("&", "&&"); + // to accelerators, tqreplace them with two ampersands. + serviceName.tqreplace("&", "&&"); TQString icon = s->icon(); if (icon=="unknown") @@ -544,7 +544,7 @@ bool PanelServiceMenu::highlightMenuItem( const TQString &menuItemId ) void PanelServiceMenu::slotExec(int id) { - if (!entryMap_.contains(id)) + if (!entryMap_.tqcontains(id)) { return; } @@ -578,7 +578,7 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev) return; } - if (!entryMap_.contains(id)) + if (!entryMap_.tqcontains(id)) { kdDebug(1210) << "Cannot find service with menu id " << id << endl; return; @@ -695,7 +695,7 @@ void PanelServiceMenu::slotContextMenu(int selected) case EditItem: proc = new KProcess(this); - *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); + *proc << KStandardDirs::findExe(TQString::tqfromLatin1("kmenuedit")); *proc << "/"+relPath_ << static_cast<KService *>(contextKSycocaEntry_)->menuId(); proc->start(); break; @@ -739,7 +739,7 @@ void PanelServiceMenu::slotContextMenu(int selected) case EditMenu: proc = new KProcess(this); - *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); + *proc << KStandardDirs::findExe(TQString::tqfromLatin1("kmenuedit")); *proc << "/"+static_cast<KServiceGroup *>(contextKSycocaEntry_)->relPath(); proc->start(); break; @@ -769,7 +769,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev) if (id < serviceMenuStartId()) return; - if (!entryMap_.contains(id)) { + if (!entryMap_.tqcontains(id)) { kdDebug(1210) << "Cannot find service with menu id " << id << endl; return; } @@ -838,7 +838,7 @@ void PanelServiceMenu::dragEnterEvent(TQDragEnterEvent *event) void PanelServiceMenu::dragLeaveEvent(TQDragLeaveEvent *) { // see PanelServiceMenu::dragEnterEvent why this is nescessary - if (!frameGeometry().contains(TQCursor::pos())) + if (!frameGeometry().tqcontains(TQCursor::pos())) { KURLDrag::setTarget(0); } @@ -932,12 +932,12 @@ void PanelServiceMenu::setSearchString(const TQString &searchString) int id = *menuItemIt; KService* s = dynamic_cast< KService* >( static_cast< KSycocaEntry* >( entryMap_[ id ])); TQString menuText = text(id); - if (menuText.contains(searchString, false) > 0 - || ( s != NULL && ( s->name().contains(searchString, false) > 0 - || s->exec().contains(searchString, false) > 0 - || s->comment().contains(searchString, false) > 0 - || s->genericName().contains(searchString, false) > 0 - || s->exec().contains(searchString, false) > 0 ) + if (menuText.tqcontains(searchString, false) > 0 + || ( s != NULL && ( s->name().tqcontains(searchString, false) > 0 + || s->exec().tqcontains(searchString, false) > 0 + || s->comment().tqcontains(searchString, false) > 0 + || s->genericName().tqcontains(searchString, false) > 0 + || s->exec().tqcontains(searchString, false) > 0 ) )) { setItemEnabled(id, true); foundSomething = true; @@ -951,7 +951,7 @@ void PanelServiceMenu::setSearchString(const TQString &searchString) /*for (int i=count()-1; i>=0; --i) { int id = idAt(i); TQString menuText = text(id); - if (menuText.contains(searchString, false) > 0) { + if (menuText.tqcontains(searchString, false) > 0) { setItemEnabled(id, true); foundSomething = true; nonemptyMenus.insert(id); @@ -995,7 +995,7 @@ void PanelServiceMenu::updateRecentlyUsedApps(KService::Ptr &service) TQString strItem(service->desktopEntryPath()); // don't add an item from root kmenu level - if (!strItem.contains('/')) + if (!strItem.tqcontains('/')) { return; } diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp index 1e9025e5a..dcf6ba51f 100644 --- a/kicker/libkicker/global.cpp +++ b/kicker/libkicker/global.cpp @@ -161,7 +161,7 @@ int maxButtonDim() int maxDim; //return (2 * KickerSettings::iconMargin()) + KIcon::SizeLarge; - KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" )); + KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::tqfromLatin1( "kickerrc" )); kickerconfig->setGroup("General"); maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);; delete kickerconfig; @@ -225,7 +225,7 @@ TQPoint popupPosition(KPanelApplet::Direction d, TQRect r; if (source->isTopLevel()) { - r = source->geometry(); + r = source->tqgeometry(); } else { @@ -236,13 +236,13 @@ TQPoint popupPosition(KPanelApplet::Direction d, { case KPanelApplet::Left: case KPanelApplet::Right: - r.setLeft( source->topLevelWidget()->x() ); - r.setWidth( source->topLevelWidget()->width() ); + r.setLeft( source->tqtopLevelWidget()->x() ); + r.setWidth( source->tqtopLevelWidget()->width() ); break; case KPanelApplet::Up: case KPanelApplet::Down: - r.setTop( source->topLevelWidget()->y() ); - r.setHeight( source->topLevelWidget()->height() ); + r.setTop( source->tqtopLevelWidget()->y() ); + r.setHeight( source->tqtopLevelWidget()->height() ); break; } } @@ -347,7 +347,7 @@ void colorize(TQImage& image) // limit max/min brightness int r, g, b; color.rgb(&r, &g, &b); - int gray = qGray(r, g, b); + int gray = tqGray(r, g, b); if (gray > 180) { r = (r - (gray - 180) < 0 ? 0 : r - (gray - 180)); g = (g - (gray - 180) < 0 ? 0 : g - (gray - 180)); diff --git a/kicker/libkicker/global.h b/kicker/libkicker/global.h index 0a4677914..ee385fa34 100644 --- a/kicker/libkicker/global.h +++ b/kicker/libkicker/global.h @@ -74,7 +74,7 @@ KDE_EXPORT TQString newDesktopFile(const KURL&url); /** * Reduces a popup menu * - * When a popup menu contains only 1 sub-menu, it makes no sense to + * When a popup menu tqcontains only 1 sub-menu, it makes no sense to * show this popup-menu but we better show the sub-menu directly. * * This function checks whether that is the case and returns either the @@ -85,7 +85,7 @@ KDE_EXPORT TQPopupMenu *reduceMenu(TQPopupMenu *); /** * Calculate the appropriate position for a popup menu based on the - * direction, the size of the menu, the widget geometry, and a optional + * direction, the size of the menu, the widget tqgeometry, and a optional * point in the local coordinates of the widget. */ KDE_EXPORT TQPoint popupPosition(KPanelApplet::Direction d, diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp index 586360904..8af29d33d 100644 --- a/kicker/libkicker/kickertip.cpp +++ b/kicker/libkicker/kickertip.cpp @@ -129,7 +129,7 @@ void KickerTip::display() // Declare interchange object and define defaults. Data data; - data.maskEffect = Dissolve; + data.tqmaskEffect = Dissolve; data.duration = 2000; data.direction = KPanelApplet::Up; data.mimeFactory = m_mimeFactory; @@ -165,7 +165,7 @@ void KickerTip::display() return; } - m_maskEffect = isVisible() ? Plain : data.maskEffect; + m_tqmaskEffect = isVisible() ? Plain : data.tqmaskEffect; m_dissolveSize = 24; m_dissolveDelta = -1; @@ -281,34 +281,34 @@ static void drawRoundRect(TQPainter &p, const TQRect &r) void KickerTip::plainMask() { - TQPainter maskPainter(&m_mask); + TQPainter tqmaskPainter(&m_tqmask); - m_mask.fill(Qt::black); + m_tqmask.fill(Qt::black); - maskPainter.setBrush(Qt::white); - maskPainter.setPen(Qt::NoPen); - //maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height()); - drawRoundRect(maskPainter, m_mask.rect()); - setMask(m_mask); + tqmaskPainter.setBrush(Qt::white); + tqmaskPainter.setPen(Qt::NoPen); + //tqmaskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(), 1600 / m_tqmask.rect().height()); + drawRoundRect(tqmaskPainter, m_tqmask.rect()); + setMask(m_tqmask); m_frameTimer.stop(); } void KickerTip::dissolveMask() { - TQPainter maskPainter(&m_mask); + TQPainter tqmaskPainter(&m_tqmask); - m_mask.fill(Qt::black); + m_tqmask.fill(Qt::black); - maskPainter.setBrush(Qt::white); - maskPainter.setPen(Qt::NoPen); - //maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height()); - drawRoundRect(maskPainter, m_mask.rect()); + tqmaskPainter.setBrush(Qt::white); + tqmaskPainter.setPen(Qt::NoPen); + //tqmaskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(), 1600 / m_tqmask.rect().height()); + drawRoundRect(tqmaskPainter, m_tqmask.rect()); m_dissolveSize += m_dissolveDelta; if (m_dissolveSize > 0) { - maskPainter.setRasterOp(Qt::EraseROP); + tqmaskPainter.setRasterOp(Qt::EraseROP); int x, y, s; const int size = 16; @@ -323,7 +323,7 @@ void KickerTip::dissolveMask() { break; } - maskPainter.drawEllipse(x - s / 2, y - s / 2, s, s); + tqmaskPainter.drawEllipse(x - s / 2, y - s / 2, s, s); } } } @@ -333,7 +333,7 @@ void KickerTip::dissolveMask() m_dissolveDelta = 1; } - setMask(m_mask); + setMask(m_tqmask); } void KickerTip::displayInternal() @@ -361,11 +361,11 @@ void KickerTip::displayInternal() int width = textX + textRect.width() + margin; int textY = (height - textRect.height()) / 2; - // resize pixmap, mask and widget + // resize pixmap, tqmask and widget bool firstTime = m_dissolveSize == 24; if (firstTime) { - m_mask.resize(width, height); + m_tqmask.resize(width, height); m_pixmap.resize(width, height); resize(width, height); if (isVisible()) @@ -378,8 +378,8 @@ void KickerTip::displayInternal() } } - // create and set transparency mask - switch(m_maskEffect) + // create and set transparency tqmask + switch(m_tqmaskEffect) { case Plain: plainMask(); @@ -392,8 +392,8 @@ void KickerTip::displayInternal() // draw background TQPainter bufferPainter(&m_pixmap); - bufferPainter.setPen(colorGroup().foreground()); - bufferPainter.setBrush(colorGroup().background()); + bufferPainter.setPen(tqcolorGroup().foreground()); + bufferPainter.setBrush(tqcolorGroup().background()); //bufferPainter.drawRoundRect(0, 0, width, height, 1600 / width, 1600 / height); drawRoundRect(bufferPainter, TQRect(0, 0, width, height)); @@ -409,13 +409,13 @@ void KickerTip::displayInternal() if (KickerSettings::mouseOversShowText()) { // draw text shadow - TQColorGroup cg = colorGroup(); + TQColorGroup cg = tqcolorGroup(); cg.setColor(TQColorGroup::Text, cg.background().dark(115)); int shadowOffset = TQApplication::reverseLayout() ? -1 : 1; m_richText->draw(&bufferPainter, textX + shadowOffset, textY + 1, TQRect(), cg); // draw text - cg = colorGroup(); + cg = tqcolorGroup(); m_richText->draw(&bufferPainter, textX, textY, rect(), cg); } } @@ -458,7 +458,7 @@ void KickerTip::tipperDestroyed(TQObject* o) void KickerTip::internalUpdate() { m_dirty = true; - repaint(false); + tqrepaint(false); } void KickerTip::enableTipping(bool tip) @@ -519,7 +519,7 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event) } if (!mouseGrabber() && - !qApp->activePopupWidget() && + !tqApp->activePopupWidget() && !isTippingFor(widget)) { TQToolTip::setGloballyEnabled(false); diff --git a/kicker/libkicker/kickertip.h b/kicker/libkicker/kickertip.h index 14118029b..65a28b8c2 100644 --- a/kicker/libkicker/kickertip.h +++ b/kicker/libkicker/kickertip.h @@ -50,7 +50,7 @@ public: TQString message; TQString subtext; TQPixmap icon; - KickerTip::MaskEffect maskEffect; + KickerTip::MaskEffect tqmaskEffect; int duration; KPanelApplet::Direction direction; @@ -95,10 +95,10 @@ protected slots: void slotSettingsChanged(); private: - TQBitmap m_mask; + TQBitmap m_tqmask; TQPixmap m_pixmap; TQPixmap m_icon; - MaskEffect m_maskEffect; + MaskEffect m_tqmaskEffect; TQSimpleRichText* m_richText; TQMimeSourceFactory* m_mimeFactory; diff --git a/kicker/libkicker/kshadowengine.cpp b/kicker/libkicker/kshadowengine.cpp index 19ccc669d..c8be4377c 100644 --- a/kicker/libkicker/kshadowengine.cpp +++ b/kicker/libkicker/kshadowengine.cpp @@ -114,7 +114,7 @@ TQImage KShadowEngine::makeShadow(const TQPixmap& textPixmap, const TQColor &bgC alphaShadow = (alphaShadow > m_shadowSettings->maxOpacity()) ? m_shadowSettings->maxOpacity() : alphaShadow; // update the shadow's i,j pixel. - result.setPixel(i,j, qRgba(bgRed, bgGreen , bgBlue, (int) alphaShadow)); + result.setPixel(i,j, tqRgba(bgRed, bgGreen , bgBlue, (int) alphaShadow)); } } return result; @@ -131,15 +131,15 @@ double KShadowEngine::defaultDecay(TQImage& source, int i, int j) return 0; double alphaShadow; - alphaShadow =(qGray(source.pixel(i-1,j-1)) * DIAGONAL_FACTOR + - qGray(source.pixel(i-1,j )) * AXIS_FACTOR + - qGray(source.pixel(i-1,j+1)) * DIAGONAL_FACTOR + - qGray(source.pixel(i ,j-1)) * AXIS_FACTOR + + alphaShadow =(tqGray(source.pixel(i-1,j-1)) * DIAGONAL_FACTOR + + tqGray(source.pixel(i-1,j )) * AXIS_FACTOR + + tqGray(source.pixel(i-1,j+1)) * DIAGONAL_FACTOR + + tqGray(source.pixel(i ,j-1)) * AXIS_FACTOR + 0 + - qGray(source.pixel(i ,j+1)) * AXIS_FACTOR + - qGray(source.pixel(i+1,j-1)) * DIAGONAL_FACTOR + - qGray(source.pixel(i+1,j )) * AXIS_FACTOR + - qGray(source.pixel(i+1,j+1)) * DIAGONAL_FACTOR) / m_shadowSettings->multiplicationFactor(); + tqGray(source.pixel(i ,j+1)) * AXIS_FACTOR + + tqGray(source.pixel(i+1,j-1)) * DIAGONAL_FACTOR + + tqGray(source.pixel(i+1,j )) * AXIS_FACTOR + + tqGray(source.pixel(i+1,j+1)) * DIAGONAL_FACTOR) / m_shadowSettings->multiplicationFactor(); return alphaShadow; } @@ -189,7 +189,7 @@ double KShadowEngine::noDecay(TQImage& source, int i, int j) else sy = j + m; - opacity += qGray(source.pixel(sx, sy)); + opacity += tqGray(source.pixel(sx, sy)); } } alphaShadow += opacity / m_shadowSettings->multiplicationFactor(); diff --git a/kicker/libkicker/kshadowengine.h b/kicker/libkicker/kshadowengine.h index 041e8faf6..0c44e1816 100644 --- a/kicker/libkicker/kshadowengine.h +++ b/kicker/libkicker/kshadowengine.h @@ -94,13 +94,13 @@ private: /* * a slower algorithm where the influence of a pixel - * is qGray(px)/(abs(dx) + abs(dy) +1). + * is tqGray(px)/(abs(dx) + abs(dy) +1). */ double doubleLinearDecay(TQImage& source, int x, int y); /* * a very slow algorithm where the influence of a pixel - * is qGray(px)/(sqrt(sqr(dx) + sqr(dy)) +1). + * is tqGray(px)/(sqrt(sqr(dx) + sqr(dy)) +1). */ double radialDecay(TQImage& source, int x, int y); diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp index 0c36ffea0..91a6c6c84 100644 --- a/kicker/libkicker/menuinfo.cpp +++ b/kicker/libkicker/menuinfo.cpp @@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. MenuInfo::MenuInfo(const TQString& desktopFile) { - KSimpleConfig df(locate("data", TQString::fromLatin1("kicker/menuext/%1").arg(desktopFile))); + KSimpleConfig df(locate("data", TQString::tqfromLatin1("kicker/menuext/%1").arg(desktopFile))); df.setGroup("Desktop Entry"); TQStringList list = df.readListEntry("X-KDE-AuthorizeAction"); diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp index a04e9aee0..483763c45 100644 --- a/kicker/libkicker/panelbutton.cpp +++ b/kicker/libkicker/panelbutton.cpp @@ -427,7 +427,7 @@ void PanelButton::enterEvent(TQEvent* e) if (!m_highlight) { m_highlight = true; - repaint(false); + tqrepaint(false); } TQButton::enterEvent(e); @@ -438,7 +438,7 @@ void PanelButton::leaveEvent(TQEvent* e) if (m_highlight) { m_highlight = false; - repaint(false); + tqrepaint(false); } TQButton::leaveEvent(e); @@ -505,7 +505,7 @@ void PanelButton::mouseReleaseEvent(TQMouseEvent *e) TQPixmap pix = labelIcon(); if (KickerSettings::showIconActivationEffect() == true) { - KIconEffect::visualActivate(this, this->geometry(), &pix); + KIconEffect::visualActivate(this, this->tqgeometry(), &pix); } } TQButton::mouseReleaseEvent(e); @@ -528,7 +528,7 @@ void PanelButton::drawButton(TQPainter *p) if (m_tileColor.isValid()) { p->fillRect(rect(), m_tileColor); - style().drawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup()); + style().drawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup()); } else if (paletteBackgroundPixmap()) { @@ -547,8 +547,8 @@ void PanelButton::drawButton(TQPainter *p) } else if (isDown() || isOn()) { - // Draw shapes to indicate the down state. - style().drawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken); + // Draw tqshapes to indicate the down state. + style().drawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup(), TQStyle::Style_Sunken); } drawButtonLabel(p); @@ -558,8 +558,8 @@ void PanelButton::drawButton(TQPainter *p) int x1, y1, x2, y2; rect().coords(&x1, &y1, &x2, &y2); TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3); - style().drawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(), - TQStyle::Style_Default, colorGroup().button()); + style().drawPrimitive(TQStyle::PE_FocusRect, p, r, tqcolorGroup(), + TQStyle::Style_Default, tqcolorGroup().button()); } } @@ -663,7 +663,7 @@ void PanelButton::drawButtonLabel(TQPainter *p) if (m_drawArrow && (m_highlight || active)) { TQStyle::PrimitiveElement e = TQStyle::PE_ArrowUp; - int arrowSize = style().pixelMetric(TQStyle::PM_MenuButtonIndicator); + int arrowSize = style().tqpixelMetric(TQStyle::PM_MenuButtonIndicator); TQRect r((width() - arrowSize)/2, 0, arrowSize, arrowSize); switch (m_arrowDirection) @@ -707,7 +707,7 @@ void PanelButton::drawButtonLabel(TQPainter *p) { flags |= TQStyle::Style_Down; } - style().drawPrimitive(e, p, r, colorGroup(), flags); + style().drawPrimitive(e, p, r, tqcolorGroup(), flags); } } @@ -771,7 +771,7 @@ void PanelButton::backedByFile(const TQString& localFilePath) disconnect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)), this, TQT_SLOT(checkForDeletion(const TQString&))); - if (!KDirWatch::self()->contains(m_backingFile)) + if (!KDirWatch::self()->tqcontains(m_backingFile)) { KDirWatch::self()->addFile(m_backingFile); } @@ -923,7 +923,7 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) if (e->type() == TQEvent::MouseMove) { TQMouseEvent *me = static_cast<TQMouseEvent *>(e); - if (rect().contains(mapFromGlobal(me->globalPos())) && + if (rect().tqcontains(mapFromGlobal(me->globalPos())) && ((me->state() & ControlButton) != 0 || (me->state() & ShiftButton) != 0)) { @@ -935,7 +935,7 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) e->type() == TQEvent::MouseButtonDblClick) { TQMouseEvent *me = static_cast<TQMouseEvent *>(e); - if (rect().contains(mapFromGlobal(me->globalPos()))) + if (rect().tqcontains(mapFromGlobal(me->globalPos()))) { m_pressedDuringPopup = true; return true; @@ -944,7 +944,7 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) else if (e->type() == TQEvent::MouseButtonRelease) { TQMouseEvent *me = static_cast<TQMouseEvent *>(e); - if (rect().contains(mapFromGlobal(me->globalPos()))) + if (rect().tqcontains(mapFromGlobal(me->globalPos()))) { if (m_pressedDuringPopup && m_popup) { diff --git a/kicker/libkicker/paneldrag.cpp b/kicker/libkicker/paneldrag.cpp index 1fb6b9ce6..28721d3f7 100644 --- a/kicker/libkicker/paneldrag.cpp +++ b/kicker/libkicker/paneldrag.cpp @@ -46,7 +46,7 @@ PanelDrag::~PanelDrag() bool PanelDrag::decode(const TQMimeSource* e, BaseContainer** container) { - TQByteArray a = e->encodedData("application/basecontainerptr"); + TQByteArray a = e->tqencodedData("application/basecontainerptr"); if (a.size() != PANELDRAG_BUFSIZE) { @@ -73,7 +73,7 @@ bool PanelDrag::canDecode(const TQMimeSource *e) return false; } - TQByteArray a = e->encodedData("application/basecontainerptr"); + TQByteArray a = e->tqencodedData("application/basecontainerptr"); if (a.size() != PANELDRAG_BUFSIZE) { return false; @@ -91,7 +91,7 @@ bool PanelDrag::canDecode(const TQMimeSource *e) return true; } -TQByteArray PanelDrag::encodedData(const char * mimeType) const +TQByteArray PanelDrag::tqencodedData(const char * mimeType) const { if (TQString("application/basecontainerptr") == mimeType && a.size() == PANELDRAG_BUFSIZE) @@ -136,7 +136,7 @@ const char * AppletInfoDrag::format(int i) const return 0; } -TQByteArray AppletInfoDrag::encodedData(const char* mimeType) const +TQByteArray AppletInfoDrag::tqencodedData(const char* mimeType) const { if (TQString("application/appletinfo") == mimeType) { @@ -158,7 +158,7 @@ bool AppletInfoDrag::canDecode(const TQMimeSource * e) bool AppletInfoDrag::decode(const TQMimeSource* e, AppletInfo& container) { - TQByteArray a = e->encodedData("application/appletinfo"); + TQByteArray a = e->tqencodedData("application/appletinfo"); if (a.isEmpty()) { diff --git a/kicker/libkicker/paneldrag.h b/kicker/libkicker/paneldrag.h index 3d7cbf858..ad620a192 100644 --- a/kicker/libkicker/paneldrag.h +++ b/kicker/libkicker/paneldrag.h @@ -39,7 +39,7 @@ class KDE_EXPORT PanelDrag : public QDragObject ~PanelDrag(); virtual const char * format(int i = 0) const; - virtual TQByteArray encodedData(const char *) const; + virtual TQByteArray tqencodedData(const char *) const; static bool canDecode(const TQMimeSource * e); static bool decode(const TQMimeSource* e, BaseContainer** container); @@ -55,7 +55,7 @@ class KDE_EXPORT AppletInfoDrag : public QDragObject ~AppletInfoDrag(); virtual const char * format(int i = 0) const; - virtual TQByteArray encodedData(const char *) const; + virtual TQByteArray tqencodedData(const char *) const; static bool canDecode(const TQMimeSource * e); static bool decode(const TQMimeSource* e, AppletInfo& container); diff --git a/kicker/libkicker/panner.cpp b/kicker/libkicker/panner.cpp index 7d11a429e..ccd40da67 100644 --- a/kicker/libkicker/panner.cpp +++ b/kicker/libkicker/panner.cpp @@ -54,9 +54,9 @@ Panner::Panner( TQWidget* parent, const char* name ) _viewport = new TQWidget(_clipper); _viewport->setBackgroundOrigin(AncestorOrigin); - // layout - _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight); - _layout->addWidget(_clipper, 1); + // tqlayout + _tqlayout = new TQBoxLayout(this, TQBoxLayout::LeftToRight); + _tqlayout->addWidget(_clipper, 1); setOrientation(Horizontal); } @@ -77,7 +77,7 @@ void Panner::createScrollButtons() //_luSB->setAutoRepeat(true); _luSB->setMinimumSize(12, 12); _luSB->hide(); - _layout->addWidget(_luSB); + _tqlayout->addWidget(_luSB); connect(_luSB, TQT_SIGNAL(pressed()), TQT_SLOT(startScrollLeftUp())); connect(_luSB, TQT_SIGNAL(released()), TQT_SLOT(stopScroll())); @@ -87,7 +87,7 @@ void Panner::createScrollButtons() //_rdSB->setAutoRepeat(true); _rdSB->setMinimumSize(12, 12); _rdSB->hide(); - _layout->addWidget(_rdSB); + _tqlayout->addWidget(_rdSB); connect(_rdSB, TQT_SIGNAL(pressed()), TQT_SLOT(startScrollRightDown())); connect(_rdSB, TQT_SIGNAL(released()), TQT_SLOT(stopScroll())); @@ -103,13 +103,13 @@ void Panner::setupButtons() { _luSB->setArrowType(Qt::LeftArrow); _rdSB->setArrowType(Qt::RightArrow); - _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); - _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); + _luSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); + _rdSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); TQToolTip::add(_luSB, i18n("Scroll left")); TQToolTip::add(_rdSB, i18n("Scroll right")); setMinimumSize(24, 0); } - _layout->setDirection(TQBoxLayout::LeftToRight); + _tqlayout->setDirection(TQBoxLayout::LeftToRight); } else { @@ -117,20 +117,20 @@ void Panner::setupButtons() { _luSB->setArrowType(Qt::UpArrow); _rdSB->setArrowType(Qt::DownArrow); - _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); - _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); + _luSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); + _rdSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); TQToolTip::add(_luSB, i18n("Scroll up")); TQToolTip::add(_rdSB, i18n("Scroll down")); setMinimumSize(0, 24); } - _layout->setDirection(TQBoxLayout::TopToBottom); + _tqlayout->setDirection(TQBoxLayout::TopToBottom); } if (isVisible()) { - // we need to manually redo the layout if we are visible + // we need to manually redo the tqlayout if we are visible // otherwise let the toolkit decide when to do this - _layout->activate(); + _tqlayout->activate(); } } diff --git a/kicker/libkicker/panner.h b/kicker/libkicker/panner.h index 66ce6cd18..fbce0569f 100644 --- a/kicker/libkicker/panner.h +++ b/kicker/libkicker/panner.h @@ -39,7 +39,7 @@ public: Panner( TQWidget* parent, const char* name = 0 ); ~Panner(); - TQSize minimumSizeHint() const { return TQWidget::minimumSizeHint(); } + TQSize tqminimumSizeHint() const { return TQWidget::tqminimumSizeHint(); } Qt::Orientation orientation() const { return _orient; } virtual void setOrientation(Orientation orientation); @@ -99,7 +99,7 @@ private: void updateScrollButtons(); Orientation _orient; - TQBoxLayout *_layout; + TQBoxLayout *_tqlayout; SimpleArrowButton *_luSB; // Left Scroll Button SimpleArrowButton *_rdSB; // Right Scroll Button TQTimer *_updateScrollButtonsTimer; diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp index 4c28b2101..5d928a6b6 100644 --- a/kicker/libkicker/simplebutton.cpp +++ b/kicker/libkicker/simplebutton.cpp @@ -65,22 +65,22 @@ void SimpleButton::setOrientation(Qt::Orientation orientation) update(); } -TQSize SimpleButton::sizeHint() const +TQSize SimpleButton::tqsizeHint() const { const TQPixmap* pm = pixmap(); if (!pm) - return TQButton::sizeHint(); + return TQButton::tqsizeHint(); else return TQSize(pm->width() + BUTTON_MARGIN, pm->height() + BUTTON_MARGIN); } -TQSize SimpleButton::minimumSizeHint() const +TQSize SimpleButton::tqminimumSizeHint() const { const TQPixmap* pm = pixmap(); if (!pm) - return TQButton::minimumSizeHint(); + return TQButton::tqminimumSizeHint(); else return TQSize(pm->width(), pm->height()); } @@ -176,7 +176,7 @@ void SimpleButton::enterEvent( TQEvent *e ) { m_highlight = true; - repaint( false ); + tqrepaint( false ); TQButton::enterEvent( e ); } @@ -184,7 +184,7 @@ void SimpleButton::leaveEvent( TQEvent *e ) { m_highlight = false; - repaint( false ); + tqrepaint( false ); TQButton::enterEvent( e ); } @@ -202,7 +202,7 @@ SimpleArrowButton::SimpleArrowButton(TQWidget *parent, Qt::ArrowType arrow, cons _inside = false; } -TQSize SimpleArrowButton::sizeHint() const +TQSize SimpleArrowButton::tqsizeHint() const { return TQSize( 12, 12 ); } @@ -236,7 +236,7 @@ void SimpleArrowButton::drawButton( TQPainter *p ) int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; if (isDown() || isOn()) flags |= TQStyle::Style_Down; - style().drawPrimitive(pe, p, r, colorGroup(), flags); + style().drawPrimitive(pe, p, r, tqcolorGroup(), flags); } void SimpleArrowButton::enterEvent( TQEvent *e ) diff --git a/kicker/libkicker/simplebutton.h b/kicker/libkicker/simplebutton.h index 1ea5c7a44..d05f556c2 100644 --- a/kicker/libkicker/simplebutton.h +++ b/kicker/libkicker/simplebutton.h @@ -34,8 +34,8 @@ class KDE_EXPORT SimpleButton : public QButton SimpleButton(TQWidget *parent, const char *name = 0); void setPixmap(const TQPixmap &pix); void setOrientation(Qt::Orientation orientaton); - TQSize sizeHint() const; - TQSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; protected: void drawButton( TQPainter *p ); @@ -67,7 +67,7 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton public: SimpleArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0); virtual ~SimpleArrowButton() {}; - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected: virtual void enterEvent( TQEvent *e ); diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp index 584a345aa..634c63d3b 100644 --- a/kicker/menuext/kate/katesessionmenu.cpp +++ b/kicker/menuext/kate/katesessionmenu.cpp @@ -124,7 +124,7 @@ void KateSessionMenu::slotExec( int id ) "kate_session_button_create_anonymous" ) == KMessageBox::No ) return; - if ( m_sessions.contains( name ) && + if ( m_sessions.tqcontains( name ) && KMessageBox::warningYesNo( 0, i18n("You allready have a session named %1. Do you want to open that session?").arg( name ), i18n("Session exists") ) == KMessageBox::No ) @@ -147,4 +147,4 @@ void KateSessionMenu::slotExec( int id ) } -// kate: space-indent: on; indent-width 2; replace-tabs on; +// kate: space-indent: on; indent-width 2; tqreplace-tabs on; diff --git a/kicker/menuext/kate/katesessionmenu.h b/kicker/menuext/kate/katesessionmenu.h index 3d5519496..bee2ba32d 100644 --- a/kicker/menuext/kate/katesessionmenu.h +++ b/kicker/menuext/kate/katesessionmenu.h @@ -42,4 +42,4 @@ class KateSessionMenu : public KPanelMenu { #endif // _KateSessionMenu_h_ -// kate: space-indent on; indent-width 2; replace-tabs on; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp index 1a31fe55c..0a0f70feb 100644 --- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp +++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp @@ -105,14 +105,14 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() } } - KBookmarkGroup parentBookmark = m_pManager->findByAddress( m_parentAddress ).toGroup(); + KBookmarkGroup parentBookmark = m_pManager->tqfindByAddress( m_parentAddress ).toGroup(); Q_ASSERT(!parentBookmark.isNull()); bool separatorInserted = false; for ( KBookmark bm = parentBookmark.first(); !bm.isNull(); bm = parentBookmark.next(bm) ) { TQString text = bm.text(); - text.replace( '&', "&&" ); + text.tqreplace( '&', "&&" ); if ( !separatorInserted && m_bIsRoot) { // inserted before the first konq bookmark, to avoid the separator if no konq bookmark m_parentMenu->insertSeparator(); separatorInserted = true; diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp index 0c072e026..fc32de55d 100644 --- a/kicker/menuext/prefmenu/prefmenu.cpp +++ b/kicker/menuext/prefmenu/prefmenu.cpp @@ -84,7 +84,7 @@ void PrefMenu::insertMenuItem(KService::Ptr& s, if (KickerSettings::menuEntryFormat() == KickerSettings::NameAndDescription) { if (!suppressGenericNames || - !suppressGenericNames->contains(s->untranslatedGenericName())) + !suppressGenericNames->tqcontains(s->untranslatedGenericName())) { serviceName = TQString("%1 (%2)").arg(serviceName).arg(comment); } @@ -119,8 +119,8 @@ void PrefMenu::insertMenuItem(KService::Ptr& s, } // item names may contain ampersands. To avoid them being converted - // to accelerators, replace them with two ampersands. - serviceName.replace("&", "&&"); + // to accelerators, tqreplace them with two ampersands. + serviceName.tqreplace("&", "&&"); int newId = insertItem(KickerLib::menuIconSet(s->icon()), serviceName, nId, nIndex); m_entryMap.insert(newId, static_cast<KSycocaEntry*>(s)); @@ -155,7 +155,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev) return; } - if (!m_entryMap.contains(id)) + if (!m_entryMap.tqcontains(id)) { kdDebug(1210) << "Cannot find service with menu id " << id << endl; return; @@ -224,7 +224,7 @@ void PrefMenu::dragEnterEvent(TQDragEnterEvent *event) void PrefMenu::dragLeaveEvent(TQDragLeaveEvent */*event*/) { // see PrefMenu::dragEnterEvent why this is nescessary - if (!frameGeometry().contains(TQCursor::pos())) + if (!frameGeometry().tqcontains(TQCursor::pos())) { KURLDrag::setTarget(0); } @@ -296,8 +296,8 @@ void PrefMenu::initialize() } // Item names may contain ampersands. To avoid them being converted - // to accelerators, replace each ampersand with two ampersands. - groupCaption.replace("&", "&&"); + // to accelerators, tqreplace each ampersand with two ampersands. + groupCaption.tqreplace("&", "&&"); PrefMenu* m = new PrefMenu(g->name(), g->relPath(), this); m->setCaption(groupCaption); @@ -323,7 +323,7 @@ void PrefMenu::initialize() void PrefMenu::slotExec(int id) { - if (!m_entryMap.contains(id)) + if (!m_entryMap.tqcontains(id)) { return; } diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp index b8c3c6d81..bbff5a3f2 100644 --- a/kicker/menuext/recentdocs/recentdocsmenu.cpp +++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp @@ -72,17 +72,17 @@ void RecentDocsMenu::initialize() { // Make sure this entry is not already present in the menu alreadyPresentInMenu = 0; for ( TQStringList::Iterator previt = previousEntries.begin(); previt != previousEntries.end(); ++previt ) { - if (TQString::localeAwareCompare(*previt, f.readName().replace('&', TQString::fromAscii("&&") )) == 0) { + if (TQString::localeAwareCompare(*previt, f.readName().tqreplace('&', TQString::fromAscii("&&") )) == 0) { alreadyPresentInMenu = 1; } } if (alreadyPresentInMenu == 0) { // Add item to menu - insertItem(SmallIconSet(f.readIcon()), f.readName().replace('&', TQString::fromAscii("&&") ), id++); + insertItem(SmallIconSet(f.readIcon()), f.readName().tqreplace('&', TQString::fromAscii("&&") ), id++); // Append to duplicate checking list - previousEntries.append(f.readName().replace('&', TQString::fromAscii("&&") )); + previousEntries.append(f.readName().tqreplace('&', TQString::fromAscii("&&") )); } } @@ -114,7 +114,7 @@ void RecentDocsMenu::mouseMoveEvent(TQMouseEvent* e) { if (!(e->state() & LeftButton)) return; - if (!rect().contains(_mouseDown)) + if (!rect().tqcontains(_mouseDown)) return; int dragLength = (e->pos() - _mouseDown).manhattanLength(); diff --git a/kicker/menuext/remote/remotemenu.cpp b/kicker/menuext/remote/remotemenu.cpp index c09f9a825..3547e3f9b 100644 --- a/kicker/menuext/remote/remotemenu.cpp +++ b/kicker/menuext/remote/remotemenu.cpp @@ -93,7 +93,7 @@ void RemoteMenu::initialize() for(; name!=endf; ++name) { - if (!names_found.contains(*name)) + if (!names_found.tqcontains(*name)) { names_found.append(*name); TQString filename = *dirpath+*name; @@ -124,7 +124,7 @@ void RemoteMenu::openRemoteDir() void RemoteMenu::slotExec(int id) { - if (m_desktopMap.contains(id)) + if (m_desktopMap.tqcontains(id)) { new KRun(m_desktopMap[id]); } diff --git a/kicker/menuext/system/systemmenu.cpp b/kicker/menuext/system/systemmenu.cpp index 12ec087d8..33eba2558 100644 --- a/kicker/menuext/system/systemmenu.cpp +++ b/kicker/menuext/system/systemmenu.cpp @@ -77,7 +77,7 @@ void SystemMenu::initialize() void SystemMenu::slotExec(int id) { - if(!m_urlMap.contains(id)) return; + if(!m_urlMap.tqcontains(id)) return; new KRun(m_urlMap[id]); // will delete itself } diff --git a/kicker/menuext/tom/README b/kicker/menuext/tom/README index 2616c76c5..8cc07d507 100644 --- a/kicker/menuext/tom/README +++ b/kicker/menuext/tom/README @@ -58,7 +58,7 @@ What should be the default task entry format be: a) Task Name b) Task Name (App Name) c) App Name (Task Name) <-- silly option =) -Should "Run A Command..." be replaced by an inline combobox? +Should "Run A Command..." be tqreplaced by an inline combobox? Pros: It's more obvious and will work even if kdesktop is gone. The widget is already written (in tom.cc) Cons: It makes it stand out too much over other entries, takes up more room diff --git a/kicker/menuext/tom/TASKGROUPS b/kicker/menuext/tom/TASKGROUPS index c1aa1ed98..1cb8a41b9 100644 --- a/kicker/menuext/tom/TASKGROUPS +++ b/kicker/menuext/tom/TASKGROUPS @@ -7,7 +7,7 @@ of tasks in the group (NumTasks) and optionally whether or not it is hidden (Hidden). For each task there is a numbered section in the file in the form TaskN. Each -section contains the user visible name for the task (Name), the associated +section tqcontains the user visible name for the task (Name), the associated .desktop file and optionally whether or not it is hidden (Hidden). An example file can be found below. diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc index 3a4ebf4ed..7ec080a8b 100644 --- a/kicker/menuext/tom/tom.cc +++ b/kicker/menuext/tom/tom.cc @@ -109,7 +109,7 @@ class runMenuWidget : public TQWidget, public QMenuItem l2->setBuddy(this); runLayout->addWidget(l2);*/ m_runEdit = new KHistoryCombo(this); - m_runEdit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); + m_runEdit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); runLayout->addWidget(m_runEdit, 10); runLayout->addSpacing(KDialog::spacingHint()); @@ -143,7 +143,7 @@ class runMenuWidget : public TQWidget, public QMenuItem TQPainter p(this); TQRect r(rect()); // ew, nasty hack. may result in coredumps due to horrid C-style cast??? - kapp->style().drawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled, + kapp->style().tqdrawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled, TQStyleOption(static_cast<TQMenuItem*>(this), 0, KIcon::SizeMedium )); p.drawPixmap(KDialog::spacingHint(), 1, icon); p.drawText((KDialog::spacingHint() * 2) + KIcon::SizeMedium, textRect.height() + ((height() - textRect.height()) / 2), i18n("Run:")); @@ -239,7 +239,7 @@ void TOM::initializeRecentDocs() KDesktopFile f(*it, true /* read only */); m_recentDocsMenu->insertItem(DesktopIcon(f.readIcon(), KIcon::SizeMedium), - f.readName().replace('&', "&&"), id); + f.readName().tqreplace('&', "&&"), id); ++id; } } @@ -301,8 +301,8 @@ int TOM::appendTaskGroup(KConfig& config, bool inSubMenu) } TQString name = config.readEntry("Name"); - // in case the name contains an ampersand, double 'em up - name.replace("&", "&&"); + // in case the name tqcontains an ampersand, double 'em up + name.tqreplace("&", "&&"); TQString desktopfile = config.readPathEntry("DesktopFile"); KService::Ptr pService = KService::serviceByDesktopPath(desktopfile); @@ -655,7 +655,7 @@ bool TOM::loadSidePixmap() // limit max/min brightness int r, g, b; color.rgb(&r, &g, &b); - int gray = qGray(r, g, b); + int gray = tqGray(r, g, b); if (gray > 180) { r = (r - (gray - 180) < 0 ? 0 : r - (gray - 180)); g = (g - (gray - 180) < 0 ? 0 : g - (gray - 180)); @@ -736,13 +736,13 @@ void TOM::setMaximumSize(int w, int h) TQRect TOM::sideImageRect() { - return TQStyle::visualRect( TQRect( frameWidth(), frameWidth(), m_sidePixmap.width(), + return TQStyle::tqvisualRect( TQRect( frameWidth(), frameWidth(), m_sidePixmap.width(), height() - 2*frameWidth() ), this ); } void TOM::resizeEvent(TQResizeEvent * e) { - setFrameRect( TQStyle::visualRect( TQRect( m_sidePixmap.width(), 0, + setFrameRect( TQStyle::tqvisualRect( TQRect( m_sidePixmap.width(), 0, width() - m_sidePixmap.width(), height() ), this ) ); } @@ -757,7 +757,7 @@ void TOM::paintEvent(TQPaintEvent * e) style().drawPrimitive( TQStyle::PE_PanelPopup, &p, TQRect( 0, 0, width(), height() ), - colorGroup(), TQStyle::Style_Default, + tqcolorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0 ) ); TQRect r = sideImageRect(); @@ -775,7 +775,7 @@ TQMouseEvent TOM::translateMouseEvent( TQMouseEvent* e ) { TQRect side = sideImageRect(); - if ( !side.contains( e->pos() ) ) + if ( !side.tqcontains( e->pos() ) ) return *e; TQPoint newpos( e->pos() ); @@ -824,7 +824,7 @@ void TOM::runCommand() void TOM::runTask(int id) { - if (!m_tasks.contains(id)) return; + if (!m_tasks.tqcontains(id)) return; kapp->propagateSessionManager(); KApplication::startServiceByDesktopPath(m_tasks[id]->desktopEntryPath(), diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp index 0501fcd9a..da8508956 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -226,9 +226,9 @@ KPanelApplet* AppletProxy::loadApplet(const AppletInfo& info) return init_ptr(0, info.configFile()); } -void AppletProxy::repaintApplet(TQWidget* widget) +void AppletProxy::tqrepaintApplet(TQWidget* widget) { - widget->repaint(); + widget->tqrepaint(); const TQObjectList* children = widget->children(); @@ -243,7 +243,7 @@ void AppletProxy::repaintApplet(TQWidget* widget) TQWidget *w = dynamic_cast<TQWidget*>(*it); if (w) { - repaintApplet(w); + tqrepaintApplet(w); } } } @@ -372,14 +372,14 @@ bool AppletProxy::process(const TQCString &fun, const TQByteArray &data, } return true; } - else if ( fun == "setAlignment(int)" ) + else if ( fun == "tqsetAlignment(int)" ) { TQDataStream dataStream( data, IO_ReadOnly ); - int alignment; - dataStream >> alignment; + int tqalignment; + dataStream >> tqalignment; if(_applet) { - _applet->setAlignment( (KPanelApplet::Alignment)alignment ); + _applet->tqsetAlignment( (KPanelApplet::Alignment)tqalignment ); } return true; } @@ -435,13 +435,13 @@ bool AppletProxy::process(const TQCString &fun, const TQByteArray &data, if(_applet) if ( _bg.isNull() ) { // no transparency _applet->unsetPalette(); - _applet->repaint(); + _applet->tqrepaint(); } else { //transparency _applet->blockSignals(true); _applet->setBackgroundMode(Qt::FixedPixmap); _applet->setPaletteBackgroundPixmap(_bg); - repaintApplet(_applet); + tqrepaintApplet(_applet); _applet->blockSignals(false); } return true; diff --git a/kicker/proxy/appletproxy.h b/kicker/proxy/appletproxy.h index 4c504022f..40ff78cc4 100644 --- a/kicker/proxy/appletproxy.h +++ b/kicker/proxy/appletproxy.h @@ -56,7 +56,7 @@ protected slots: void slotApplicationRemoved(const TQCString&); private: - void repaintApplet(TQWidget* widget); + void tqrepaintApplet(TQWidget* widget); AppletInfo *_info; KPanelApplet *_applet; diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index 3d931c95b..73b4052ab 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -258,7 +258,7 @@ void ExtensionProxy::dock(const TQCString& callbackID) bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &replyData) { - if ( fun == "sizeHint(int,TQSize)" ) + if ( fun == "tqsizeHint(int,TQSize)" ) { TQDataStream dataStream( data, IO_ReadOnly ); int pos; @@ -272,7 +272,7 @@ bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data, if(!_extension) reply << maxSize; else - reply << _extension->sizeHint((KPanelExtension::Position)pos, maxSize); + reply << _extension->tqsizeHint((KPanelExtension::Position)pos, maxSize); return true; } @@ -287,14 +287,14 @@ bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data, } return true; } - else if ( fun == "setAlignment(int)" ) + else if ( fun == "tqsetAlignment(int)" ) { TQDataStream dataStream( data, IO_ReadOnly ); - int alignment; - dataStream >> alignment; + int tqalignment; + dataStream >> tqalignment; if(_extension) { - _extension->setAlignment( (KPanelExtension::Alignment)alignment ); + _extension->tqsetAlignment( (KPanelExtension::Alignment)tqalignment ); } return true; } diff --git a/kicker/rich-ideas.txt b/kicker/rich-ideas.txt index afe55f33a..6b71343ce 100644 --- a/kicker/rich-ideas.txt +++ b/kicker/rich-ideas.txt @@ -2,7 +2,7 @@ Positioning of extensions ========================= -How about using the alignment flags (or similar) for position, and the +How about using the tqalignment flags (or similar) for position, and the direction flags for how to fill? @@ -32,10 +32,10 @@ Now here's the filling etc. etc. -Essentially, this splits the concept of positioning and layout. Now, lets get +Essentially, this splits the concept of positioning and tqlayout. Now, lets get crazy: -Imagine we're in position a and want to have a triangular corner layout: +Imagine we're in position a and want to have a triangular corner tqlayout: 1247 35 @@ -43,7 +43,7 @@ Imagine we're in position a and want to have a triangular corner layout: So, maybe we need some sort of concept of (one of): 1) multiple linked rectangular blocks - 2) extensions/bars with a mask + 2) extensions/bars with a tqmask 3) each item being considered independently (maybe some sort of magnetic blocks so they can be draggable?) diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp index 808408fc9..b8bcdcb20 100644 --- a/kicker/taskbar/taskbar.cpp +++ b/kicker/taskbar/taskbar.cpp @@ -60,13 +60,13 @@ TaskBar::TaskBar( TQWidget *parent, const char *name ) m_showOnlyIconified(false), m_textShadowEngine(0), m_ignoreUpdates(false), - m_relayoutTimer(0, "TaskBar::m_relayoutTimer") + m_retqlayoutTimer(0, "TaskBar::m_retqlayoutTimer") { arrowType = LeftArrow; - blocklayout = true; + blocktqlayout = true; // init - setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); // setup animation frames for (int i = 1; i < 11; i++) @@ -77,7 +77,7 @@ TaskBar::TaskBar( TQWidget *parent, const char *name ) // configure configure(); - connect(&m_relayoutTimer, TQT_SIGNAL(timeout()), + connect(&m_retqlayoutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reLayout())); connect(this, TQT_SIGNAL(contentsMoving(int, int)), TQT_SLOT(setBackground())); @@ -114,7 +114,7 @@ TaskBar::TaskBar( TQWidget *parent, const char *name ) add((*sIt)); } - blocklayout = false; + blocktqlayout = false; connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); keys = new KGlobalAccel( this ); @@ -160,7 +160,7 @@ KTextShadowEngine *TaskBar::textShadowEngine() } -TQSize TaskBar::sizeHint() const +TQSize TaskBar::tqsizeHint() const { // get our minimum height based on the minimum button height or the // height of the font in use, which is largest @@ -171,7 +171,7 @@ TQSize TaskBar::sizeHint() const return TQSize(BUTTON_MIN_WIDTH, minButtonHeight); } -TQSize TaskBar::sizeHint( KPanelExtension::Position p, TQSize maxSize) const +TQSize TaskBar::tqsizeHint( 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 @@ -246,7 +246,7 @@ void TaskBar::configure() TQApplication::desktop()->isVirtualDesktop() && TQApplication::desktop()->numScreens() > 1) || (TQApplication::desktop()->numScreens() < 2); - // we need to watch geometry issues if we aren't showing windows when we + // we need to watch tqgeometry issues if we aren't showing windows when we // are paying attention to the current Xinerama screen if (m_showOnlyCurrentScreen) { @@ -294,7 +294,7 @@ void TaskBar::resizeEvent( TQResizeEvent* e ) { if (m_showOnlyCurrentScreen) { - TQPoint topLeft = mapToGlobal(this->geometry().topLeft()); + TQPoint topLeft = mapToGlobal(this->tqgeometry().topLeft()); if (m_currentScreen != TQApplication::desktop()->screenNumber(topLeft)) { // we have been moved to another screen! @@ -358,7 +358,7 @@ void TaskBar::add(Startup::Ptr startup) it != containers.end(); ++it) { - if ((*it)->contains(startup)) + if ((*it)->tqcontains(startup)) { return; } @@ -432,7 +432,7 @@ void TaskBar::remove(Task::Ptr task, TaskContainer* container) it != m_hiddenContainers.end(); ++it) { - if ((*it)->contains(task)) + if ((*it)->tqcontains(task)) { (*it)->finish(); m_deletableContainers.append(*it); @@ -447,7 +447,7 @@ void TaskBar::remove(Task::Ptr task, TaskContainer* container) it != containers.end(); ++it) { - if ((*it)->contains(task)) + if ((*it)->tqcontains(task)) { container = *it; break; @@ -490,7 +490,7 @@ void TaskBar::remove(Startup::Ptr startup, TaskContainer* container) it != m_hiddenContainers.end(); ++it) { - if ((*it)->contains(startup)) + if ((*it)->tqcontains(startup)) { (*it)->remove(startup); @@ -511,7 +511,7 @@ void TaskBar::remove(Startup::Ptr startup, TaskContainer* container) it != containers.end(); ++it) { - if ((*it)->contains(startup)) + if ((*it)->tqcontains(startup)) { container = *it; break; @@ -551,7 +551,7 @@ void TaskBar::desktopChanged(int desktop) return; } - m_relayoutTimer.stop(); + m_retqlayoutTimer.stop(); m_ignoreUpdates = true; for (TaskContainer::Iterator it = containers.begin(); it != containers.end(); @@ -580,7 +580,7 @@ void TaskBar::windowChanged(Task::Ptr task) { TaskContainer* c = *it; - if (c->contains(task)) + if (c->tqcontains(task)) { container = c; break; @@ -620,7 +620,7 @@ void TaskBar::windowChangedGeometry(Task::Ptr task) ++it) { TaskContainer* c = *it; - if (c->contains(task)) + if (c->tqcontains(task)) { container = c; break; @@ -645,11 +645,11 @@ void TaskBar::windowChangedGeometry(Task::Ptr task) void TaskBar::reLayoutEventually() { - m_relayoutTimer.stop(); + m_retqlayoutTimer.stop(); - if (!blocklayout && !m_ignoreUpdates) + if (!blocktqlayout && !m_ignoreUpdates) { - m_relayoutTimer.start(25, true); + m_retqlayoutTimer.start(25, true); } } @@ -660,7 +660,7 @@ void TaskBar::reLayout() // popup menu is visible. // // To get around this, we collect the containers and delete them manually - // when doing a relayout. (kling) + // when doing a retqlayout. (kling) if (!m_deletableContainers.isEmpty()) { TaskContainer::List::iterator it = m_deletableContainers.begin(); for (; it != m_deletableContainers.end(); ++it) @@ -700,7 +700,7 @@ void TaskBar::reLayout() int minButtonHeight = fm.height() > TaskBarSettings::minimumButtonHeight() ? fm.height() : TaskBarSettings::minimumButtonHeight(); - // horizontal layout + // horizontal tqlayout if (orientation() == Horizontal) { int bwidth = BUTTON_MIN_WIDTH; @@ -743,10 +743,10 @@ void TaskBar::reLayout() } } - // layout containers + // tqlayout containers // for taskbars at the bottom, we need to ensure that the bottom - // buttons touch the bottom of the screen. since we layout from + // buttons touch the bottom of the screen. since we tqlayout from // top to bottom this means seeing if we have any padding and // popping it on the top. this preserves Fitt's Law behaviour // for taskbars on the bottom @@ -784,7 +784,7 @@ void TaskBar::reLayout() c->setBackground(); } } - else // vertical layout + else // vertical tqlayout { // adjust content size if (contentsRect().height() < (int)list.count() * minButtonHeight) @@ -792,7 +792,7 @@ void TaskBar::reLayout() resizeContents(contentsRect().width(), list.count() * minButtonHeight); } - // layout containers + // tqlayout containers int i = 0; for (TaskContainer::Iterator it = list.begin(); it != list.end(); @@ -818,12 +818,12 @@ void TaskBar::reLayout() void TaskBar::setViewportBackground() { - const TQPixmap *bg = parentWidget()->backgroundPixmap(); + const TQPixmap *bg = tqparentWidget()->backgroundPixmap(); if (bg) { - TQPixmap pm(parentWidget()->size()); - pm.fill(parentWidget(), pos() + viewport()->pos()); + TQPixmap pm(tqparentWidget()->size()); + pm.fill(tqparentWidget(), pos() + viewport()->pos()); viewport()->setPaletteBackgroundPixmap(pm); viewport()->setBackgroundOrigin(WidgetOrigin); } @@ -898,9 +898,9 @@ void TaskBar::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 ); } } @@ -988,7 +988,7 @@ bool TaskBar::shouldGroup() const void TaskBar::reGroup() { isGrouping = shouldGroup(); - blocklayout = true; + blocktqlayout = true; TaskContainer::Iterator lastContainer = m_hiddenContainers.end(); for (TaskContainer::Iterator it = m_hiddenContainers.begin(); @@ -1027,7 +1027,7 @@ void TaskBar::reGroup() add(*sIt); } - blocklayout = false; + blocktqlayout = false; reLayoutEventually(); } @@ -1163,7 +1163,7 @@ int TaskBar::showScreen() const if (m_showOnlyCurrentScreen && m_currentScreen == -1) { const_cast<TaskBar*>(this)->m_currentScreen = - TQApplication::desktop()->screenNumber(mapToGlobal(this->geometry().topLeft())); + TQApplication::desktop()->screenNumber(mapToGlobal(this->tqgeometry().topLeft())); } return m_currentScreen; diff --git a/kicker/taskbar/taskbar.h b/kicker/taskbar/taskbar.h index ff160bc92..0c45657cf 100644 --- a/kicker/taskbar/taskbar.h +++ b/kicker/taskbar/taskbar.h @@ -47,8 +47,8 @@ public: TaskBar( TQWidget *parent = 0, const char *name = 0 ); ~TaskBar(); - TQSize sizeHint() const; - TQSize sizeHint( KPanelExtension::Position, TQSize maxSize ) const; + TQSize tqsizeHint() const; + TQSize tqsizeHint( KPanelExtension::Position, TQSize maxSize ) const; void setOrientation( Orientation ); void setArrowType( Qt::ArrowType at ); @@ -108,7 +108,7 @@ private: void sortContainersByDesktop(TaskContainer::List& list); void setViewportBackground(); - bool blocklayout; + bool blocktqlayout; bool m_showAllWindows; // The screen to show, -1 for all screens int m_currentScreen; @@ -127,7 +127,7 @@ private: void reGroup(); KGlobalAccel* keys; KTextShadowEngine* m_textShadowEngine; - TQTimer m_relayoutTimer; + TQTimer m_retqlayoutTimer; bool m_ignoreUpdates; TQImage m_blendGradient; }; diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp index 661706bdb..0101ae59d 100644 --- a/kicker/taskbar/taskbarcontainer.cpp +++ b/kicker/taskbar/taskbarcontainer.cpp @@ -63,20 +63,20 @@ TaskBarContainer::TaskBarContainer( bool enableFrame, TQWidget *parent, const ch margin = 0; } - layout = new TQBoxLayout( this, TQApplication::reverseLayout() ? + tqlayout = new TQBoxLayout( this, TQApplication::reverseLayout() ? TQBoxLayout::RightToLeft : TQBoxLayout::LeftToRight ); - layout->setMargin( margin ); + tqlayout->setMargin( margin ); // scrollable taskbar taskBar = new TaskBar(this); - layout->addWidget( taskBar ); + tqlayout->addWidget( taskBar ); connect( taskBar, TQT_SIGNAL( containerCountChanged() ), TQT_SIGNAL( containerCountChanged() ) ); setBackground(); - // read settings and setup layout + // read settings and setup tqlayout configure(); connectDCOPSignal("", "", "kdeTaskBarConfigChanged()", @@ -110,7 +110,7 @@ void TaskBarContainer::configure() connect(windowListMenu, TQT_SIGNAL(aboutToHide()), TQT_SLOT(windowListMenuAboutToHide())); - // geometry + // tqgeometry TQString icon; switch (direction) { @@ -135,8 +135,8 @@ void TaskBarContainer::configure() windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon, KIcon::Panel, 16)); - windowListButton->setMinimumSize(windowListButton->sizeHint()); - layout->insertWidget(0, windowListButton); + windowListButton->setMinimumSize(windowListButton->tqsizeHint()); + tqlayout->insertWidget(0, windowListButton); windowListButton->show(); } } @@ -175,7 +175,7 @@ void TaskBarContainer::orientationChange(Orientation o) windowListButton->setFixedWidth(WINDOWLISTBUTTON_SIZE); windowListButton->setMaximumHeight(BUTTON_MAX_WIDTH); } - layout->setDirection(TQApplication::reverseLayout() ? + tqlayout->setDirection(TQApplication::reverseLayout() ? TQBoxLayout::RightToLeft : TQBoxLayout::LeftToRight); } @@ -186,7 +186,7 @@ void TaskBarContainer::orientationChange(Orientation o) windowListButton->setMaximumWidth(BUTTON_MAX_WIDTH); windowListButton->setFixedHeight(WINDOWLISTBUTTON_SIZE); } - layout->setDirection(TQBoxLayout::TopToBottom); + tqlayout->setDirection(TQBoxLayout::TopToBottom); } taskBar->setOrientation(o); @@ -194,7 +194,7 @@ void TaskBarContainer::orientationChange(Orientation o) { windowListButton->setOrientation(o); } - layout->activate(); + tqlayout->activate(); } void TaskBarContainer::popupDirectionChange(KPanelApplet::Direction d) @@ -230,7 +230,7 @@ void TaskBarContainer::popupDirectionChange(KPanelApplet::Direction d) windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon, KIcon::Panel, 16)); - windowListButton->setMinimumSize(windowListButton->sizeHint()); + windowListButton->setMinimumSize(windowListButton->tqsizeHint()); } } @@ -249,13 +249,13 @@ void TaskBarContainer::showWindowListMenu() pos.setX( pos.x() + width() ); break; case KPanelApplet::Left: - pos.setX( pos.x() - windowListMenu->sizeHint().width() ); + pos.setX( pos.x() - windowListMenu->tqsizeHint().width() ); break; case KPanelApplet::Down: pos.setY( pos.y() + height() ); break; case KPanelApplet::Up: - pos.setY( pos.y() - windowListMenu->sizeHint().height() ); + pos.setY( pos.y() - windowListMenu->tqsizeHint().height() ); default: break; } @@ -277,9 +277,9 @@ void TaskBarContainer::reconnectWindowListButton() connect( windowListButton, TQT_SIGNAL( pressed() ), TQT_SLOT( showWindowListMenu() ) ); } -TQSize TaskBarContainer::sizeHint( KPanelExtension::Position p, TQSize maxSize) const +TQSize TaskBarContainer::tqsizeHint( KPanelExtension::Position p, TQSize maxSize) const { - TQSize size = taskBar->sizeHint( p, maxSize ); + TQSize size = taskBar->tqsizeHint( p, maxSize ); if ( (p == KPanelExtension::Left || p == KPanelExtension::Right) && showWindowListButton ) { return TQSize( size.width(), size.height() + WINDOWLISTBUTTON_SIZE ); } diff --git a/kicker/taskbar/taskbarcontainer.h b/kicker/taskbar/taskbarcontainer.h index 87a55c2b9..61147494a 100644 --- a/kicker/taskbar/taskbarcontainer.h +++ b/kicker/taskbar/taskbarcontainer.h @@ -48,7 +48,7 @@ public: void popupDirectionChange( KPanelApplet::Direction ); void preferences(); //FIXME: don't use Position, use Orientation - TQSize sizeHint( KPanelExtension::Position, TQSize maxSize ) const; + TQSize tqsizeHint( KPanelExtension::Position, TQSize maxSize ) const; void setBackground(); k_dcop: @@ -66,7 +66,7 @@ protected slots: private: KPanelApplet::Direction direction; bool showWindowListButton; - TQBoxLayout * layout; + TQBoxLayout * tqlayout; TaskBar * taskBar; SimpleButton * windowListButton; KWindowListMenu * windowListMenu; diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index 1e4829a38..556e46d17 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/kicker/taskbar/taskcontainer.cpp @@ -157,9 +157,9 @@ void TaskContainer::stopTimers() attentionTimer.stop(); } -void TaskContainer::taskChanged(bool geometryOnlyChange) +void TaskContainer::taskChanged(bool tqgeometryOnlyChange) { - if (geometryOnlyChange) + if (tqgeometryOnlyChange) { // we really don't care about those changes, which we may be getting // thanks to the pager, for instance, turning it on in taskmanager. @@ -315,7 +315,7 @@ void TaskContainer::resizeEvent( TQResizeEvent * ) { // calculate the icon rect TQRect br( style().subRect( TQStyle::SR_PushButtonContents, this ) ); - iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this ); + iconRect = TQStyle::tqvisualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this ); } void TaskContainer::add(Task::Ptr task) @@ -390,7 +390,7 @@ void TaskContainer::remove(Startup::Ptr startup) } } -bool TaskContainer::contains(Task::Ptr task) +bool TaskContainer::tqcontains(Task::Ptr task) { if (!task) { @@ -408,12 +408,12 @@ bool TaskContainer::contains(Task::Ptr task) return false; } -bool TaskContainer::contains(Startup::Ptr startup) +bool TaskContainer::tqcontains(Startup::Ptr startup) { return startup && (m_startup == startup); } -bool TaskContainer::contains(WId win) +bool TaskContainer::tqcontains(WId win) { Task::List::iterator itEnd = tasks.end(); for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it) @@ -580,8 +580,8 @@ void TaskContainer::drawButton(TQPainter *p) bool sunken = isDown() || (alwaysDrawButtons && (active || aboutToActivate)); bool reverse = TQApplication::reverseLayout(); TQRect br(style().subRect(TQStyle::SR_PushButtonContents, this)); - TQPoint shift = TQPoint(style().pixelMetric(TQStyle::PM_ButtonShiftHorizontal), - style().pixelMetric(TQStyle::PM_ButtonShiftVertical)); + TQPoint shift = TQPoint(style().tqpixelMetric(TQStyle::PM_ButtonShiftHorizontal), + style().tqpixelMetric(TQStyle::PM_ButtonShiftVertical)); // draw button background if (drawButton) @@ -643,7 +643,7 @@ void TaskContainer::drawButton(TQPainter *p) // draw modified overlay if (!modPixmap.isNull()) { - TQRect r = TQStyle::visualRect(TQRect(br.x() + textPos, + TQRect r = TQStyle::tqvisualRect(TQRect(br.x() + textPos, (height() - 16) / 2, 16, 16), this); @@ -660,7 +660,7 @@ void TaskContainer::drawButton(TQPainter *p) // draw text if (!text.isEmpty()) { - TQRect tr = TQStyle::visualRect(TQRect(br.x() + textPos + 1, 0, + TQRect tr = TQStyle::tqvisualRect(TQRect(br.x() + textPos + 1, 0, width() - textPos, height()), this); int textFlags = AlignVCenter | SingleLine; @@ -772,7 +772,7 @@ void TaskContainer::drawButton(TQPainter *p) } int flags = TQStyle::Style_Enabled; - TQRect ar = TQStyle::visualRect(TQRect(br.x() + br.width() - 8 - 2, + TQRect ar = TQStyle::tqvisualRect(TQRect(br.x() + br.width() - 8 - 2, br.y(), 8, br.height()), this); if (sunken) { @@ -784,7 +784,7 @@ void TaskContainer::drawButton(TQPainter *p) // draw mouse over frame in transparent mode if (m_mouseOver && halo) - KickerLib::drawBlendedRect(p, TQRect(0, 0, width(), height()), colorGroup().foreground()); + KickerLib::drawBlendedRect(p, TQRect(0, 0, width(), height()), tqcolorGroup().foreground()); if (aboutToActivate) { @@ -932,7 +932,7 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e) // This is to avoid the flicker caused by redrawing the // button as unpressed just before it's activated. - if (!rect().contains(e->pos())) + if (!rect().tqcontains(e->pos())) { TQToolButton::mouseReleaseEvent(e); return; @@ -1146,17 +1146,17 @@ void TaskContainer::popupMenu(int action) pos.setX(pos.x() + width()); break; case LeftArrow: - pos.setX(pos.x() - m_menu->sizeHint().width()); + pos.setX(pos.x() - m_menu->tqsizeHint().width()); break; case DownArrow: if ( TQApplication::reverseLayout() ) - pos.setX( pos.x() + width() - m_menu->sizeHint().width() ); + pos.setX( pos.x() + width() - m_menu->tqsizeHint().width() ); pos.setY( pos.y() + height() ); break; case UpArrow: if ( TQApplication::reverseLayout() ) - pos.setX( pos.x() + width() - m_menu->sizeHint().width() ); - pos.setY(pos.y() - m_menu->sizeHint().height()); + pos.setX( pos.x() + width() - m_menu->tqsizeHint().width() ); + pos.setY(pos.y() - m_menu->tqsizeHint().height()); break; default: break; @@ -1287,7 +1287,7 @@ void TaskContainer::setArrowType( Qt::ArrowType at ) void TaskContainer::publishIconGeometry( TQPoint global ) { - TQPoint p = global + geometry().topLeft(); + TQPoint p = global + tqgeometry().topLeft(); Task::List::const_iterator itEnd = tasks.constEnd(); for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it) diff --git a/kicker/taskbar/taskcontainer.h b/kicker/taskbar/taskcontainer.h index 567a74a79..8f6dee032 100644 --- a/kicker/taskbar/taskcontainer.h +++ b/kicker/taskbar/taskcontainer.h @@ -57,9 +57,9 @@ public: void remove(Task::Ptr); void remove(Startup::Ptr); - bool contains(Task::Ptr); - bool contains(Startup::Ptr); - bool contains(WId); + bool tqcontains(Task::Ptr); + bool tqcontains(Startup::Ptr); + bool tqcontains(WId); bool isEmpty(); bool onCurrentDesktop(); @@ -120,7 +120,7 @@ protected slots: void dragSwitch(); void iconChanged(); void setLastActivated(); - void taskChanged(bool geometryChangeOnly); + void taskChanged(bool tqgeometryChangeOnly); void showMe(); private: diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp index 864d10f5d..bf3b805ee 100644 --- a/kicker/taskmanager/tasklmbmenu.cpp +++ b/kicker/taskmanager/tasklmbmenu.cpp @@ -75,7 +75,7 @@ void TaskMenuItem::paint(TQPainter *p, const TQColorGroup &cg, p->drawText(x, y, w, h, AlignAuto|AlignVCenter|DontClip|ShowPrefix, m_text); } -TQSize TaskMenuItem::sizeHint() +TQSize TaskMenuItem::tqsizeHint() { TQFont font = TQFont(); if (m_isActive) @@ -111,7 +111,7 @@ void TaskLMBMenu::fillMenu() { Task::Ptr t = (*it); - TQString text = t->visibleName().replace("&", "&&"); + TQString text = t->visibleName().tqreplace("&", "&&"); TaskMenuItem *menuItem = new TaskMenuItem(text, t->isActive(), diff --git a/kicker/taskmanager/tasklmbmenu.h b/kicker/taskmanager/tasklmbmenu.h index d11091d82..6f277ad0d 100644 --- a/kicker/taskmanager/tasklmbmenu.h +++ b/kicker/taskmanager/tasklmbmenu.h @@ -38,7 +38,7 @@ public: ~TaskMenuItem(); void paint(TQPainter*, const TQColorGroup&, bool, bool, int, int, int, int); - TQSize sizeHint(); + TQSize tqsizeHint(); void setAttentionState(bool state) { m_attentionState = state; } private: diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp index 739c626b5..9aeb9415b 100644 --- a/kicker/taskmanager/taskmanager.cpp +++ b/kicker/taskmanager/taskmanager.cpp @@ -247,7 +247,7 @@ Task::Ptr TaskManager::findTask(int desktop, const TQPoint& p) continue; } - if (t->geometry().contains(p)) + if (t->tqgeometry().tqcontains(p)) { int index = list.findIndex(t->window()); if (index > currentIndex) @@ -295,7 +295,7 @@ void TaskManager::windowAdded(WId w ) WId transient_for = (WId) transient_for_tmp; // check if it's transient for a skiptaskbar window - if( _skiptaskbar_windows.contains( transient_for )) + if( _skiptaskbar_windows.tqcontains( transient_for )) return; // lets see if this is a transient for an existing task @@ -831,7 +831,7 @@ void Task::updateDemandsAttentionState( WId w ) NETWinInfo i( qt_xdisplay(), w, qt_xrootwin(), NET::WMState ); if(i.state() & NET::DemandsAttention) { - if (!_transients_demanding_attention.contains(w)) + if (!_transients_demanding_attention.tqcontains(w)) { _transients_demanding_attention.append(w); } @@ -984,10 +984,10 @@ bool Task::idMatch( const TQString& id1, const TQString& id2 ) if ( id1.isEmpty() || id2.isEmpty() ) return false; - if ( id1.contains( id2 ) > 0 ) + if ( id1.tqcontains( id2 ) > 0 ) return true; - if ( id2.contains( id1 ) > 0 ) + if ( id2.tqcontains( id1 ) > 0 ) return true; return false; @@ -1009,7 +1009,7 @@ void Task::move() KWin::deIconifyWindow(_win); } - TQRect geom = _info.geometry(); + TQRect geom = _info.tqgeometry(); TQCursor::setPos(geom.center()); NETRootInfo ri(qt_xdisplay(), NET::WMMoveResize); @@ -1032,7 +1032,7 @@ void Task::resize() KWin::deIconifyWindow(_win); } - TQRect geom = _info.geometry(); + TQRect geom = _info.tqgeometry(); TQCursor::setPos(geom.bottomRight()); NETRootInfo ri(qt_xdisplay(), NET::WMMoveResize); @@ -1305,8 +1305,8 @@ void Task::updateThumbnail() // by the thumbnail generation. This makes things much smoother // on slower machines. // - TQWidget *rootWin = qApp->desktop(); - TQRect geom = _info.geometry(); + TQWidget *rootWin = tqApp->desktop(); + TQRect geom = _info.tqgeometry(); _grab = TQPixmap::grabWindow(rootWin->winId(), geom.x(), geom.y(), geom.width(), geom.height()); @@ -1329,7 +1329,7 @@ void Task::generateThumbnail() width = width * _thumbSize; height = height * _thumbSize; - img = img.smoothScale( qRound(width), qRound(height) ); + img = img.smoothScale( tqRound(width), tqRound(height) ); _thumb = img; _grab.resize( 0, 0 ); // Makes grab a null image. @@ -1356,7 +1356,7 @@ TQPixmap Task::thumbnail(int maxDimension) Picture picture = XRenderCreatePicture(dpy, m_windowPixmap, format, CPSubwindowMode, &picAttr); - // Get shaped windows handled correctly. + // Get tqshaped windows handled correctly. XserverRegion region = XFixesCreateRegionFromWindow(dpy, m_frameId, WindowRegionBounding); XFixesSetPictureClipRegion(dpy, picture, 0, 0, region); @@ -1386,10 +1386,10 @@ TQPixmap Task::thumbnail(int maxDimension) XRenderComposite(dpy, hasAlpha ? PictOpOver : PictOpSrc, picture, // src - None, // mask + None, // tqmask full.x11RenderHandle(), // dst 0, 0, // src offset - 0, 0, // mask offset + 0, 0, // tqmask offset 0, 0, // dst offset winAttr.width, winAttr.height); @@ -1411,10 +1411,10 @@ TQPixmap Task::thumbnail(int maxDimension) XRenderComposite(TQPaintDevice::x11AppDisplay(), PictOpOver, // we're filtering, alpha values are probable picture, // src - None, // mask + None, // tqmask thumbnail.x11RenderHandle(), // dst 0, 0, // src offset - 0, 0, // mask offset + 0, 0, // tqmask offset 0, 0, // dst offset thumbnailWidth, thumbnailHeight); #endif @@ -1499,7 +1499,7 @@ bool TaskDrag::canDecode(const TQMimeSource* e) Task::List TaskDrag::decode( const TQMimeSource* e ) { - TQByteArray data(e->encodedData("taskbar/task")); + TQByteArray data(e->tqencodedData("taskbar/task")); Task::List tasks; if (data.size()) diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h index 8f5876360..dd730e410 100644 --- a/kicker/taskmanager/taskmanager.h +++ b/kicker/taskmanager/taskmanager.h @@ -262,12 +262,12 @@ public: bool showInPager() const { return _info.state() ^ NET::SkipPager; } /** - * Returns the geometry for this window + * Returns the tqgeometry for this window */ - TQRect geometry() const { return _info.geometry(); } + TQRect tqgeometry() const { return _info.tqgeometry(); } /** - * Returns the geometry for the from of this window + * Returns the tqgeometry for the from of this window */ TQRect frameGeometry() const { return _info.frameGeometry(); } @@ -427,7 +427,7 @@ signals: /** * Indicates that this task has changed in some way. */ - void changed(bool geometryChangeOnly); + void changed(bool tqgeometryChangeOnly); /** * Indicates that the icon for this task has changed. @@ -529,7 +529,7 @@ public: /** * The name of the starting task (if known). */ - TQString text() const { return _data.findName(); } + TQString text() const { return _data.tqfindName(); } /** * The name of the executable of the starting task. @@ -539,7 +539,7 @@ public: /** * The name of the icon to be used for the starting task. */ - TQString icon() const { return _data.findIcon(); } + TQString icon() const { return _data.tqfindIcon(); } void update( const KStartupInfoData& data ); const KStartupInfoId& id() const { return _id; } @@ -616,7 +616,7 @@ public: bool isOnTop(const Task*); /** - * Tells the task manager whether or not we care about geometry + * Tells the task manager whether or not we care about tqgeometry * updates. This generates a lot of activity so should only be used * when necessary. */ diff --git a/kicker/taskmanager/taskrmbmenu.cpp b/kicker/taskmanager/taskrmbmenu.cpp index fb4c9ae87..bb5ee6035 100644 --- a/kicker/taskmanager/taskrmbmenu.cpp +++ b/kicker/taskmanager/taskrmbmenu.cpp @@ -236,7 +236,7 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t) m->insertSeparator(); for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) { - TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&")); + TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).tqreplace('&', "&&")); id = m->insertItem( name, t, TQT_SLOT( toDesktop(int) ) ); m->setItemParameter( id, i ); m->setItemChecked( id, !t->isOnAllDesktops() && t->desktop() == i ); @@ -256,7 +256,7 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu() m->insertSeparator(); for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) { - TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&")); + TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).tqreplace('&', "&&")); id = m->insertItem( name, this, TQT_SLOT( slotAllToDesktop(int) ) ); m->setItemParameter( id, i ); } |