diff options
Diffstat (limited to 'kicker')
182 files changed, 1481 insertions, 1438 deletions
diff --git a/kicker/applets/clock/analog.ui b/kicker/applets/clock/analog.ui index 4a20312ec..ea0135ceb 100644 --- a/kicker/applets/clock/analog.ui +++ b/kicker/applets/clock/analog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>AnalogWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AnalogWidget</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup2_3_2</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_AnalogShowDate</cstring> </property> @@ -38,7 +38,7 @@ <string>Dat&e</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_AnalogShowSeconds</cstring> </property> @@ -49,7 +49,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_AnalogShowDayOfWeek</cstring> </property> @@ -57,7 +57,7 @@ <string>Da&y of week</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_AnalogShowFrame</cstring> </property> @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -84,7 +84,7 @@ </spacer> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -95,7 +95,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>layout9</cstring> </property> @@ -125,7 +125,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>foregroundAnalogLabel</cstring> </property> @@ -149,14 +149,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>backgroundAnalogLabel</cstring> </property> @@ -181,7 +181,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>shadowAnalogLabel</cstring> </property> @@ -197,7 +197,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_3</cstring> </property> @@ -208,7 +208,7 @@ <cstring>kcfg_AnalogAntialias</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>None</string> @@ -241,14 +241,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>310</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_AnalogLCDStyle</cstring> </property> @@ -269,7 +269,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>50</height> diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index 26f1ae4c0..072bd6161 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -95,46 +95,46 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent, setIcon(SmallIcon("date")); settings = new SettingsWidgetImp(prefs, zone, 0, "General"); - connect(settings->kcfg_Type, TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int))); + connect(TQT_TQOBJECT(settings->kcfg_Type), TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int))); - settings->kcfg_PlainBackgroundColor->setDefaultColor(KApplication::palette().active().background()); - settings->kcfg_DateBackgroundColor->setDefaultColor(KApplication::palette().active().background()); + settings->kcfg_PlainBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background()); + settings->kcfg_DateBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background()); // Digital digitalPage = new DigitalWidget(0, "DigitalClock"); settings->widgetStack->addWidget(digitalPage, 1); - digitalPage->kcfg_DigitalBackgroundColor->setDefaultColor(KApplication::palette().active().background()); + digitalPage->kcfg_DigitalBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background()); // Analog analogPage = new AnalogWidget(0, "AnalogClock"); settings->widgetStack->addWidget(analogPage, 2); - analogPage->kcfg_AnalogBackgroundColor->setDefaultColor(KApplication::palette().active().background()); + analogPage->kcfg_AnalogBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background()); // Fuzzy fuzzyPage = new FuzzyWidget(0, "FuzzyClock"); settings->widgetStack->addWidget(fuzzyPage, 3); - fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(KApplication::palette().active().background()); + fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background()); - connect(settings->kcfg_PlainShowDate, TQT_SIGNAL(toggled(bool)), + connect(TQT_TQOBJECT(settings->kcfg_PlainShowDate), TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - connect(settings->kcfg_PlainShowDayOfWeek, TQT_SIGNAL(toggled(bool)), + connect(TQT_TQOBJECT(settings->kcfg_PlainShowDayOfWeek), TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - connect(digitalPage->kcfg_DigitalShowDate, TQT_SIGNAL(toggled(bool)), + connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDate), TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - connect(digitalPage->kcfg_DigitalShowDayOfWeek, TQT_SIGNAL(toggled(bool)), + connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDayOfWeek), TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - connect(digitalPage->kcfg_DigitalShowDate, TQT_SIGNAL(toggled(bool)), + connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDate), TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - connect(analogPage->kcfg_AnalogShowDate, TQT_SIGNAL(toggled(bool)), + connect(TQT_TQOBJECT(analogPage->kcfg_AnalogShowDate), TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - connect(analogPage->kcfg_AnalogShowDayOfWeek, TQT_SIGNAL(toggled(bool)), + connect(TQT_TQOBJECT(analogPage->kcfg_AnalogShowDayOfWeek), TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - connect(fuzzyPage->kcfg_FuzzyShowDate, TQT_SIGNAL(toggled(bool)), + connect(TQT_TQOBJECT(fuzzyPage->kcfg_FuzzyShowDate), TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - connect(fuzzyPage->kcfg_FuzzyShowDayOfWeek, TQT_SIGNAL(toggled(bool)), + connect(TQT_TQOBJECT(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()); } @@ -397,7 +397,7 @@ void DigitalClock::paintEvent(TQPaintEvent*) p.drawTiledPixmap(0, 0, width(), height(), lcdPattern); } else if (_prefs->digitalBackgroundColor() != - KApplication::palette().active().background()) + KApplication::tqpalette().active().background()) { p.fillRect(0, 0, width(), height(), _prefs->digitalBackgroundColor()); } @@ -564,7 +564,7 @@ void AnalogClock::paintEvent( TQPaintEvent * ) paint.drawTiledPixmap(0, 0, spWidth, spHeight, lcdPattern); } - else if (_prefs->analogBackgroundColor() != KApplication::palette().active().background()) + else if (_prefs->analogBackgroundColor() != KApplication::tqpalette().active().background()) { _spPx->fill(_prefs->analogBackgroundColor()); } @@ -817,9 +817,9 @@ void FuzzyClock::drawContents(TQPainter *p) } newTimeStr = normalFuzzy[sector]; - int phStart = newTimeStr.find("%"); + int phStart = newTimeStr.tqfind("%"); if (phStart >= 0) { // protect yourself from translations - int phLength = newTimeStr.find(" ", phStart) - phStart; + int phLength = newTimeStr.tqfind(" ", phStart) - phStart; // larrosa: we want the exact length, in case the translation needs it, // in other case, we would cut off the end of the translation. @@ -832,13 +832,13 @@ void FuzzyClock::drawContents(TQPainter *p) realHour = 12 - ((_time.hour() + deltaHour) % 12 + 1); if (realHour==0) { newTimeStr = normalFuzzyOne[sector]; - phStart = newTimeStr.find("%"); + phStart = newTimeStr.tqfind("%"); // larrosa: Note that length is the same, // 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.tqat(0).upper())); } } else if (_prefs->fuzzyness() == 3) { newTimeStr = dayTime[_time.hour() / 3]; @@ -865,7 +865,7 @@ void FuzzyClock::drawContents(TQPainter *p) TQRect tr; - if (_applet->getOrientation() == Vertical) + if (_applet->getOrientation() == Qt::Vertical) { p->rotate(90); tr = TQRect(4, -2, height() - 8, -(width()) + 2); @@ -919,12 +919,12 @@ 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 @@ -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,24 +1127,24 @@ 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 - int p = dateStr.findRev(TQRegExp("[^0-9]")); + int p = dateStr.tqfindRev(TQRegExp("[^0-9]")); if (p > 0) { _date->setText(dateStr.insert(p, '\n')); } } - 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); @@ -1180,7 +1180,7 @@ void ClockApplet::preferences(bool timezone) void ClockApplet::updateFollowBackground() { - TQColor globalBgroundColor = KApplication::palette().active().background(); + TQColor globalBgroundColor = KApplication::tqpalette().active().background(); TQColor bgColor; switch (_prefs->type()) @@ -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) { @@ -1317,7 +1317,7 @@ void ClockApplet::setTimerTo60() void ClockApplet::setBackground() { - TQColor globalBgroundColor = KApplication::palette().active().background(); + TQColor globalBgroundColor = KApplication::tqpalette().active().background(); TQColor fgColor, bgColor; if (!_clock) @@ -1382,7 +1382,7 @@ void ClockApplet::globalPaletteChange() if (!m_dateFollowBackgroundSetting && !m_followBackgroundSetting) return; - TQColor globalBgroundColor = KApplication::palette().active().background(); + TQColor globalBgroundColor = KApplication::tqpalette().active().background(); if (m_dateFollowBackgroundSetting) _prefs->setDateBackgroundColor(globalBgroundColor); @@ -1552,15 +1552,15 @@ void ClockApplet::aboutToShowContextMenu() menu->insertTitle( SmallIcon( "clock" ), i18n( "Clock" ) ); KLocale *loc = KGlobal::locale(); - TQDateTime dt = TQDateTime::currentDateTime(); - dt = dt.addSecs(TZoffset); + TQDateTime dt = TQDateTime::tqcurrentDateTime(); + dt = TQT_TQDATETIME_OBJECT(dt.addSecs(TZoffset)); KPopupMenu *copyMenu = new KPopupMenu( menu ); copyMenu->insertItem(loc->formatDateTime(dt), 201); - copyMenu->insertItem(loc->formatDate(dt.date()), 202); - copyMenu->insertItem(loc->formatDate(dt.date(), true), 203); - copyMenu->insertItem(loc->formatTime(dt.time()), 204); - copyMenu->insertItem(loc->formatTime(dt.time(), true), 205); + copyMenu->insertItem(loc->formatDate(TQT_TQDATE_OBJECT(dt.date())), 202); + copyMenu->insertItem(loc->formatDate(TQT_TQDATE_OBJECT(dt.date()), true), 203); + copyMenu->insertItem(loc->formatTime(TQT_TQTIME_OBJECT(dt.time())), 204); + copyMenu->insertItem(loc->formatTime(TQT_TQTIME_OBJECT(dt.time()), true), 205); copyMenu->insertItem(dt.date().toString(), 206); copyMenu->insertItem(dt.time().toString(), 207); copyMenu->insertItem(dt.toString(), 208); @@ -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); @@ -1621,12 +1621,12 @@ void ClockApplet::slotCopyMenuActivated( int id ) TQTime ClockApplet::clockGetTime() { - return TQTime::currentTime().addSecs(TZoffset); + return TQT_TQTIME_OBJECT(TQTime::currentTime().addSecs(TZoffset)); } TQDate ClockApplet::clockGetDate() { - return TQDateTime::currentDateTime().addSecs(TZoffset).date(); + return TQT_TQDATE_OBJECT(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() @@ -1653,13 +1653,13 @@ void ClockApplet::mousePressEvent(TQMouseEvent *ev) { switch (ev->button()) { - case TQMouseEvent::LeftButton: + case Qt::LeftButton: toggleCalendar(); break; - case TQMouseEvent::RightButton: + case Qt::RightButton: openContextMenu(); break; - case TQMouseEvent::MidButton: + case Qt::MidButton: nextZone(); TQToolTip::remove(_clock->widget()); break; @@ -1686,10 +1686,10 @@ void ClockApplet::wheelEvent(TQWheelEvent* e) // catch the mouse clicks of our child widgets bool ClockApplet::eventFilter( TQObject *o, TQEvent *e ) { - if (( o == _clock->widget() || o == _date || o == _dayOfWeek) && + if (( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_clock->widget()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_date) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_dayOfWeek)) && e->type() == TQEvent::MouseButtonPress ) { - mousePressEvent(static_cast<TQMouseEvent*>(e) ); + mousePressEvent(TQT_TQMOUSEEVENT(e) ); return true; } @@ -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.tqfind('/') + 1).tqreplace("_", " ")); _date->setShown(true); } else @@ -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.tqfind('/') + 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.tqfind('/') + 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.tqfind('/') + 1).tqreplace("_", " ") + "</b>"; } data.subtext += " " + _time + ", " + _date + "<br>"; } @@ -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(TQT_TQDATETIME_OBJECT(TQDateTime::tqcurrentDateTime().addSecs(m_clock->TZoffset))); } else { diff --git a/kicker/applets/clock/clock.h b/kicker/applets/clock/clock.h index 144fb50c6..498ce4b9d 100644 --- a/kicker/applets/clock/clock.h +++ b/kicker/applets/clock/clock.h @@ -246,7 +246,7 @@ class FuzzyClock : public TQFrame, public ClockWidget bool alreadyDrawing; }; -class ClockAppletToolTip : public QToolTip +class ClockAppletToolTip : public TQToolTip { public: ClockAppletToolTip( ClockApplet* clock ); diff --git a/kicker/applets/clock/clockapplet.kcfg b/kicker/applets/clock/clockapplet.kcfg index fb38d6583..ed375d03a 100644 --- a/kicker/applets/clock/clockapplet.kcfg +++ b/kicker/applets/clock/clockapplet.kcfg @@ -20,11 +20,11 @@ <group name="Date"> <entry name="DateForegroundColor" type="Color" key="Foreground_Color"> <label>Foreground color.</label> - <default code="true">KApplication::palette().active().text()</default> + <default code="true">KApplication::tqpalette().active().text()</default> </entry> <entry name="DateBackgroundColor" type="Color" key="Background_Color"> <label>Foreground color.</label> - <default code="true">KApplication::palette().active().background()</default> + <default code="true">KApplication::tqpalette().active().background()</default> </entry> <entry name="DateFont" type="Font" key="Font"> <label>Font for the clock.</label> @@ -63,11 +63,11 @@ defFont.setBold(true); </entry> <entry name="PlainForegroundColor" type="Color" key="Foreground_Color"> <label>Foreground color.</label> - <default code="true">KApplication::palette().active().text()</default> + <default code="true">KApplication::tqpalette().active().text()</default> </entry> <entry name="PlainBackgroundColor" type="Color" key="Background_Color"> <label>Background color.</label> - <default code="true">KApplication::palette().active().background()</default> + <default code="true">KApplication::tqpalette().active().background()</default> </entry> </group> <group name="Digital"> @@ -89,15 +89,15 @@ defFont.setBold(true); </entry> <entry name="DigitalForegroundColor" type="Color" key="Foreground_Color"> <label>Foreground color.</label> - <default code="true">KApplication::palette().active().text()</default> + <default code="true">KApplication::tqpalette().active().text()</default> </entry> <entry name="DigitalBackgroundColor" type="Color" key="Background_Color"> <label>Background color.</label> - <default code="true">KApplication::palette().active().background()</default> + <default code="true">KApplication::tqpalette().active().background()</default> </entry> <entry name="DigitalShadowColor" type="Color" key="Shadow_Color"> <label>Shadow color.</label> - <default code="true">KApplication::palette().active().mid()</default> + <default code="true">KApplication::tqpalette().active().mid()</default> </entry> <entry name="DigitalBlink" type="Bool" key="Blink"> <label>Blink</label> @@ -127,15 +127,15 @@ defFont.setBold(true); </entry> <entry name="AnalogForegroundColor" type="Color" key="Foreground_Color"> <label>Foreground color.</label> - <default code="true">KApplication::palette().active().text()</default> + <default code="true">KApplication::tqpalette().active().text()</default> </entry> <entry name="AnalogBackgroundColor" type="Color" key="Background_Color"> <label>Background color.</label> - <default code="true">KApplication::palette().active().background()</default> + <default code="true">KApplication::tqpalette().active().background()</default> </entry> <entry name="AnalogShadowColor" type="Color" key="Shadow_Color"> <label>Shadow color.</label> - <default code="true">KApplication::palette().active().mid()</default> + <default code="true">KApplication::tqpalette().active().mid()</default> </entry> <entry name="AnalogLCDStyle" type="Bool" key="LCD_Style"> <label>LCD Style</label> @@ -168,11 +168,11 @@ defFont=KGlobalSettings::generalFont(); </entry> <entry name="FuzzyForegroundColor" type="Color" key="Foreground_Color"> <label>Foreground color.</label> - <default code="true">KApplication::palette().active().text()</default> + <default code="true">KApplication::tqpalette().active().text()</default> </entry> <entry name="FuzzyBackgroundColor" type="Color" key="Background_Color"> <label>Background color.</label> - <default code="true">KApplication::palette().active().background()</default> + <default code="true">KApplication::tqpalette().active().background()</default> </entry> <entry name="Fuzzyness" type="Int"> <label>Fuzzyness</label> diff --git a/kicker/applets/clock/datepicker.cpp b/kicker/applets/clock/datepicker.cpp index 3864db556..3f5d5b4ed 100644 --- a/kicker/applets/clock/datepicker.cpp +++ b/kicker/applets/clock/datepicker.cpp @@ -33,9 +33,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. DatePicker::DatePicker(TQWidget *parent, const TQDate& date, Prefs* _prefs) : TQVBox( parent, 0, _prefs->calendarFullWindow() - ? (WType_TopLevel | WDestructiveClose | + ? (WFlags)(WType_TopLevel | WDestructiveClose | WStyle_StaysOnTop) - : (WStyle_Customize | WStyle_NoBorder | + : (WFlags)(WStyle_Customize | WStyle_NoBorder | WType_TopLevel | WDestructiveClose | WStyle_StaysOnTop) ), prefs(_prefs) diff --git a/kicker/applets/clock/datepicker.h b/kicker/applets/clock/datepicker.h index f2e8a3397..60ca765f7 100644 --- a/kicker/applets/clock/datepicker.h +++ b/kicker/applets/clock/datepicker.h @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class KDatePicker; class Prefs; -class DatePicker : public QVBox +class DatePicker : public TQVBox { public: DatePicker(TQWidget*, const TQDate&, Prefs* _prefs); diff --git a/kicker/applets/clock/digital.ui b/kicker/applets/clock/digital.ui index 256bca99b..ab90a6438 100644 --- a/kicker/applets/clock/digital.ui +++ b/kicker/applets/clock/digital.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>DigitalWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DigitalWidget</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup2_3</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_DigitalShowDate</cstring> </property> @@ -41,7 +41,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_DigitalShowSeconds</cstring> </property> @@ -49,7 +49,7 @@ <string>Seco&nds</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_DigitalShowDayOfWeek</cstring> </property> @@ -57,7 +57,7 @@ <string>Da&y of week</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_DigitalBlink</cstring> </property> @@ -65,7 +65,7 @@ <string>Blin&king dots</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_DigitalShowFrame</cstring> </property> @@ -83,7 +83,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -92,7 +92,7 @@ </spacer> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -103,7 +103,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_DigitalLCDStyle</cstring> </property> @@ -114,7 +114,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout14</cstring> </property> @@ -122,7 +122,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>Foreground_ColorL</cstring> </property> @@ -147,7 +147,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>backgroundDigitalLabel</cstring> </property> @@ -193,14 +193,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>110</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>Shadow_ColorL</cstring> </property> @@ -226,7 +226,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kicker/applets/clock/fuzzy.ui b/kicker/applets/clock/fuzzy.ui index 04e910340..ebe6af9fc 100644 --- a/kicker/applets/clock/fuzzy.ui +++ b/kicker/applets/clock/fuzzy.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>FuzzyWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>FuzzyWidget</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -42,7 +42,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_FuzzyShowDate</cstring> </property> @@ -53,7 +53,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_FuzzyShowDayOfWeek</cstring> </property> @@ -61,7 +61,7 @@ <string>Da&y of week</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_FuzzyShowFrame</cstring> </property> @@ -79,7 +79,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -88,7 +88,7 @@ </spacer> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -109,14 +109,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> </size> </property> </spacer> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -124,7 +124,7 @@ <string>Font:</string> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>layout11</cstring> </property> @@ -132,7 +132,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel1_2_3_4_3</cstring> </property> @@ -153,14 +153,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_4_3_2</cstring> </property> @@ -189,7 +189,7 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="0" column="2"> + <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> <cstring>Layout7_3</cstring> </property> @@ -197,7 +197,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4_3</cstring> </property> @@ -205,7 +205,7 @@ <string>Low</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>kcfg_Fuzzyness</cstring> </property> @@ -231,7 +231,7 @@ <number>1</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel5_3</cstring> </property> @@ -241,7 +241,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel3_3</cstring> </property> diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui index 215aa5433..53e9c80cd 100644 --- a/kicker/applets/clock/settings.ui +++ b/kicker/applets/clock/settings.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>SettingsWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SettingsWidget</cstring> </property> @@ -19,11 +19,11 @@ <property name="margin"> <number>0</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabs</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -34,7 +34,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout14</cstring> </property> @@ -42,7 +42,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -59,7 +59,7 @@ <cstring>clockCombo</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Plain Clock</string> @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -111,14 +111,14 @@ </spacer> </hbox> </widget> - <widget class="QWidgetStack"> + <widget class="TQWidgetStack"> <property name="name"> <cstring>widgetStack</cstring> </property> <property name="lineWidth"> <number>0</number> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -132,7 +132,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup2_3_2_2</cstring> </property> @@ -143,7 +143,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_PlainShowDate</cstring> </property> @@ -154,7 +154,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_PlainShowSeconds</cstring> </property> @@ -162,7 +162,7 @@ <string>&Seconds</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_PlainShowDayOfWeek</cstring> </property> @@ -170,7 +170,7 @@ <string>Da&y of week</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_PlainShowFrame</cstring> </property> @@ -188,7 +188,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -197,7 +197,7 @@ </spacer> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -208,7 +208,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel1_3_3_2</cstring> </property> @@ -224,7 +224,7 @@ <string>Font:</string> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel1_2_3_4_3_2</cstring> </property> @@ -260,7 +260,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel1_4_3_2_2</cstring> </property> @@ -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> @@ -318,7 +318,7 @@ </vbox> </widget> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>dateBox</cstring> </property> @@ -337,7 +337,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -353,7 +353,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -371,14 +371,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>343</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>layout2</cstring> </property> @@ -386,7 +386,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -421,7 +421,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>100</height> @@ -430,7 +430,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp index 320d84b4c..48cce1ccb 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]); @@ -117,7 +117,7 @@ void Zone::readZoneList(KListView *listView ) li->setText(1, comment); li->setText(2, tzName); /* store complete path in ListView */ - if (_remotezonelist.findIndex(tzName) != -1) + if (_remotezonelist.tqfindIndex(tzName) != -1) li->setOn(true); // locate the flag from /l10n/%1/flag.png @@ -151,7 +151,7 @@ void Zone::getSelectedZonelist(KListView *listView) root = root->nextSibling(); continue; } - root = root->parent(); + root = root->tqparent(); if (root) root = root->nextSibling(); } diff --git a/kicker/applets/launcher/configdlgbase.ui b/kicker/applets/launcher/configdlgbase.ui index bfb1bc4e6..49916ebeb 100644 --- a/kicker/applets/launcher/configdlgbase.ui +++ b/kicker/applets/launcher/configdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ConfigDlgBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ConfigDlgBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_DragEnabled</cstring> </property> @@ -27,7 +27,7 @@ <string>Allow drag and drop</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -38,7 +38,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_ConserveSpace</cstring> </property> @@ -49,7 +49,7 @@ <string>Do not expand icons to the size of the panel</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -57,7 +57,7 @@ <string>Icon size:</string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>iconDim</cstring> </property> @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>332</width> <height>20</height> @@ -84,7 +84,7 @@ </spacer> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>autoAdjustGroup</cstring> </property> @@ -95,7 +95,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>layout1</cstring> </property> @@ -103,7 +103,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSlider" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQSlider" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_HistoryHorizon</cstring> </property> @@ -130,38 +130,38 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>140</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> <property name="text"> <string>Short Term</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel2</cstring> </property> <property name="text"> <string>Long Term</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> </grid> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -184,7 +184,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>50</width> <height>20</height> @@ -196,7 +196,7 @@ <cstring>kcfg_AutoAdjustMaxItems</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -204,7 +204,7 @@ <string>Minimum number of applications:</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_AutoAdjustEnabled</cstring> </property> 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..6e68e2ce1 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/kicker/applets/launcher/quickbutton.cpp @@ -67,7 +67,7 @@ QuickURL::QuickURL(const TQString &u) if (_menuId.endsWith(".desktop")) { // Strip path TQString s = _menuId; - s = s.mid(s.findRev('/')+1); + s = s.mid(s.tqfindRev('/')+1); s = s.left(s.length()-8); _service = KService::serviceByStorageId(s); if (!_service) { @@ -121,7 +121,7 @@ TQPixmap QuickURL::pixmap( mode_t _mode, KIcon::Group _group, { // Load icon TQPixmap pxmap = KMimeType::pixmapForURL(_kurl, _mode, _group, _force_size, _state); // Resize to fit button - pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, TQImage::ScaleMin)); + pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, TQ_ScaleMin)); return pxmap; } @@ -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()); @@ -152,7 +152,7 @@ QuickButton::QuickButton(const TQString &u, KAction* configAction, this, TQT_SLOT(removeApp())); m_stickyAction = new KToggleAction(i18n("Never Remove Automatically"), - KShortcut(), this); + KShortcut(), TQT_TQOBJECT(this)); connect(m_stickyAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotStickyToggled(bool))); m_stickyAction->plug(_popup, 2); @@ -197,9 +197,9 @@ void QuickButton::resizeEvent(TQResizeEvent *e) void QuickButton::mousePressEvent(TQMouseEvent *e) { - if (e->button() == RightButton) + if (e->button() == Qt::RightButton) _popup->popup(e->globalPos()); - else if (e->button() == LeftButton) { + else if (e->button() == Qt::LeftButton) { _dragPos = e->pos(); TQButton::mousePressEvent(e); } @@ -207,7 +207,7 @@ void QuickButton::mousePressEvent(TQMouseEvent *e) void QuickButton::mouseMoveEvent(TQMouseEvent *e) { - if ((e->state() & LeftButton) == 0) return; + if ((e->state() & Qt::LeftButton) == 0) return; TQPoint p(e->pos() - _dragPos); if (p.manhattanLength() <= KGlobalSettings::dndEventDelay()) return; diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp index a278b39c9..9c1228a2d 100644 --- a/kicker/applets/launcher/quicklauncher.cpp +++ b/kicker/applets/launcher/quicklauncher.cpp @@ -108,7 +108,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions, m_dragButtons = 0; m_configAction = new KAction(i18n("Configure Quicklauncher..."), "configure", KShortcut(), - this, TQT_SLOT(slotConfigure()), this); + TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), TQT_TQOBJECT(this)); m_saveTimer = new TQTimer(this, "m_saveTimer"); connect(m_saveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(saveConfig())); @@ -503,7 +503,7 @@ void QuickLauncher::about() void QuickLauncher::mousePressEvent(TQMouseEvent *e) { - if (e->button() == RightButton) + if (e->button() == Qt::RightButton) { m_popup->popup(e->globalPos()); } @@ -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); } @@ -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/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp index 3bc53efae..882c8286b 100644 --- a/kicker/applets/lockout/lockout.cpp +++ b/kicker/applets/lockout/lockout.cpp @@ -62,7 +62,7 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name //setFrameStyle(Panel | Sunken); setBackgroundOrigin( AncestorOrigin ); - if ( orientation() == Horizontal ) + if ( orientation() == Qt::Horizontal ) layout = new TQBoxLayout( this, TQBoxLayout::TopToBottom ); else layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight ); @@ -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,17 +113,17 @@ Lockout::~Lockout() // direction and wasting a lot of space. void Lockout::checkLayout( int height ) const { - TQSize s = minimumSizeHint(); + TQSize s = tqminimumSizeHint(); TQBoxLayout::Direction direction = layout->direction(); if ( direction == TQBoxLayout::LeftToRight && - ( ( orientation() == Vertical && s.width() - 2 >= height ) || - ( orientation() == Horizontal && s.width() - 2 < height ) ) ) { + ( ( orientation() == Qt::Vertical && s.width() - 2 >= height ) || + ( orientation() == Qt::Horizontal && s.width() - 2 < height ) ) ) { layout->setDirection( TQBoxLayout::TopToBottom ); } else if ( direction == TQBoxLayout::TopToBottom && - ( ( orientation() == Vertical && s.height() - 2 < height ) || - ( orientation() == Horizontal && s.height() - 2 >= height ) ) ) { + ( ( orientation() == Qt::Vertical && s.height() - 2 < height ) || + ( orientation() == Qt::Horizontal && s.height() - 2 >= height ) ) ) { layout->setDirection( TQBoxLayout::LeftToRight ); } } @@ -131,13 +131,13 @@ void Lockout::checkLayout( int height ) const 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() @@ -146,7 +146,7 @@ void Lockout::lock() int kicker_screen_number = qt_xscreen(); if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); - kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", ""); + kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString("")); } void Lockout::logout() @@ -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 ); } } @@ -193,10 +193,10 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e ) KConfig *conf = config(); conf->setGroup("lockout"); - TQMouseEvent *me = static_cast<TQMouseEvent *>( e ); - if( me->button() == TQMouseEvent::RightButton ) + TQMouseEvent *me = TQT_TQMOUSEEVENT( e ); + if( me->button() == Qt::RightButton ) { - if( o == lockButton ) + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lockButton) ) { TQPopupMenu *popup = new TQPopupMenu(); @@ -219,7 +219,7 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e ) return true; } - else if ( o == logoutButton ) + else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(logoutButton) ) { TQPopupMenu *popup = new TQPopupMenu(); diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp index b137b5d5c..25b5869ff 100644 --- a/kicker/applets/media/mediaapplet.cpp +++ b/kicker/applets/media/mediaapplet.cpp @@ -154,7 +154,7 @@ void MediaApplet::arrangeButtons() MediumButton *button = *it; button_size = std::max(button_size, - orientation() == Vertical ? + orientation() == Qt::Vertical ? button->heightForWidth(width()) : button->widthForHeight(height()) ); // button->widthForHeight(height()) : @@ -162,7 +162,7 @@ void MediaApplet::arrangeButtons() } int kicker_size; - if (orientation() == Vertical) + if (orientation() == Qt::Vertical) { kicker_size = width(); } @@ -200,7 +200,7 @@ void MediaApplet::arrangeButtons() ++pack_count; - if(orientation() == Vertical) + if(orientation() == Qt::Vertical) { if (pack_count < max_packed_buttons) { @@ -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(); @@ -425,7 +425,7 @@ void MediaApplet::reloadList() void MediaApplet::mousePressEvent(TQMouseEvent *e) { - if(e->button()==RightButton) + if(e->button()==Qt::RightButton) { KPopupMenu menu(this); diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp index 0fae43441..1e71fbd6f 100644 --- a/kicker/applets/media/mediumbutton.cpp +++ b/kicker/applets/media/mediumbutton.cpp @@ -45,13 +45,13 @@ #include <konq_drag.h> MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem) - : PanelPopupButton(parent), mActions(this, this), mFileItem(fileItem), mOpenTimer(0, + : PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)), mFileItem(fileItem), mOpenTimer(0, "MediumButton::mOpenTimer") { - KAction *a = KStdAction::paste(this, TQT_SLOT(slotPaste()), + KAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), &mActions, "pasteto"); a->setShortcut(0); - a = KStdAction::copy(this, TQT_SLOT(slotCopy()), &mActions, "copy"); + a = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), &mActions, "copy"); a->setShortcut(0); setBackgroundOrigin(AncestorOrigin); @@ -145,7 +145,7 @@ void MediumButton::slotCopy() { KonqDrag * obj = KonqDrag::newDrag(mFileItem.url(), false); - TQApplication::clipboard()->setData( obj ); + TQApplication::tqclipboard()->setData( obj ); } void MediumButton::dragEnterEvent(TQDragEnterEvent* e) diff --git a/kicker/applets/media/preferencesdialog.cpp b/kicker/applets/media/preferencesdialog.cpp index 8d9cdcc94..3833f5062 100644 --- a/kicker/applets/media/preferencesdialog.cpp +++ b/kicker/applets/media/preferencesdialog.cpp @@ -26,7 +26,7 @@ #include <klistview.h> #include <kfiledetailview.h> -class MediumTypeItem : public QCheckListItem +class MediumTypeItem : public TQCheckListItem { public: MediumTypeItem(TQListView *parent, const TQString name, @@ -40,7 +40,7 @@ private: TQString mMimeType; }; -class MediumItem : public QCheckListItem +class MediumItem : public TQCheckListItem { public: MediumItem(TQListView *parent, const TQString name, @@ -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/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp index dc2431e15..6975af0c0 100644 --- a/kicker/applets/minipager/pagerapplet.cpp +++ b/kicker/applets/minipager/pagerapplet.cpp @@ -114,7 +114,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions, setFont( KGlobalSettings::taskbarFont() ); - m_kwin = new KWinModule(this); + m_kwin = new KWinModule(TQT_TQOBJECT(this)); m_activeWindow = m_kwin->activeWindow(); m_curDesk = m_kwin->currentDesktop(); @@ -365,8 +365,8 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y) if( m_desktopLayoutOwner == NULL ) { // must own manager selection before setting global desktop layout int screen = DefaultScreen( qt_xdisplay()); - m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(), - screen, this ); + m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).tqarg( screen ).latin1(), + screen, TQT_TQOBJECT(this) ); if( !m_desktopLayoutOwner->claim( false )) { delete m_desktopLayoutOwner; @@ -381,7 +381,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y) void KMiniPager::resizeEvent(TQResizeEvent*) { - bool horiz = orientation() == Horizontal; + bool horiz = orientation() == Qt::Horizontal; int deskNum = m_desktops.count(); int rowNum = m_settings->numberOfRows(); @@ -723,7 +723,7 @@ void KMiniPager::aboutToShowContextMenu() rowMenu->insertItem(i18n("two rows or columns", "&2"), 2 + rowOffset); rowMenu->insertItem( i18n("three rows or columns", "&3"), 3 + rowOffset); connect(rowMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); - showMenu->insertItem((orientation()==Horizontal) ? i18n("&Rows"): + showMenu->insertItem((orientation()==Qt::Horizontal) ? i18n("&Rows"): i18n("&Columns"), rowMenu); @@ -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/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp index 10a5aa8c9..77d751a07 100644 --- a/kicker/applets/minipager/pagerbutton.cpp +++ b/kicker/applets/minipager/pagerbutton.cpp @@ -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 = TQBrush(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,15 +523,15 @@ 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) { - if (e->button() == RightButton) + if (e->button() == Qt::RightButton) { // prevent LMB down -> RMB down -> LMB up sequence - if ((e->state() & MouseButtonMask ) == NoButton) + if ((e->state() & Qt::MouseButtonMask ) == Qt::NoButton) { emit showMenu(e->globalPos(), m_desktop); return; @@ -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); @@ -747,7 +747,7 @@ void KMiniPagerButton::slotToggled( bool b ) bool KMiniPagerButton::eventFilter( TQObject *o, TQEvent * e) { - if (o && o == m_lineEdit && + if (o && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_lineEdit) && (e->type() == TQEvent::FocusOut || e->type() == TQEvent::Hide)) { m_pager->kwin()->setDesktopName( m_desktop, m_lineEdit->text() ); diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp index 44f2229ec..05a64b94b 100644 --- a/kicker/applets/naughty/NaughtyApplet.cpp +++ b/kicker/applets/naughty/NaughtyApplet.cpp @@ -72,7 +72,7 @@ NaughtyApplet::NaughtyApplet TQVBoxLayout * layout = new TQVBoxLayout(this); layout->addWidget(button_); - monitor_ = new NaughtyProcessMonitor(2, 20, this); + monitor_ = new NaughtyProcessMonitor(2, 20, TQT_TQOBJECT(this)); connect ( @@ -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/NaughtyConfigDialog.cpp b/kicker/applets/naughty/NaughtyConfigDialog.cpp index 57146778d..8b6948a04 100644 --- a/kicker/applets/naughty/NaughtyConfigDialog.cpp +++ b/kicker/applets/naughty/NaughtyConfigDialog.cpp @@ -85,7 +85,7 @@ NaughtyConfigDialog::threshold() const return uint(kini_threshold_->value()); } - QStringList + TQStringList NaughtyConfigDialog::ignoreList() const { TQStringList retval; diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.cpp b/kicker/applets/naughty/NaughtyProcessMonitor.cpp index 6228cfba1..e8cdaf60f 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] ; @@ -231,7 +231,7 @@ NaughtyProcessMonitor::canKill(ulong pid) const #endif } - QString + TQString NaughtyProcessMonitor::processName(ulong pid) const { #if defined(__linux__) || defined(__OpenBSD__) @@ -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,16 +280,16 @@ 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]; - int lastSlash = processName.findRev('/'); + int lastSlash = processName.tqfindRev('/'); // Get basename, if there's a path. if (-1 != lastSlash) @@ -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/naughty/NaughtyProcessMonitor.h b/kicker/applets/naughty/NaughtyProcessMonitor.h index cc5c91cfc..c21cb393b 100644 --- a/kicker/applets/naughty/NaughtyProcessMonitor.h +++ b/kicker/applets/naughty/NaughtyProcessMonitor.h @@ -25,7 +25,7 @@ class NaughtyProcessMonitorPrivate; -class NaughtyProcessMonitor : public QObject +class NaughtyProcessMonitor : public TQObject { Q_OBJECT diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp index 94f30f33a..8f441a397 100644 --- a/kicker/applets/run/runapplet.cpp +++ b/kicker/applets/run/runapplet.cpp @@ -92,7 +92,7 @@ RunApplet::RunApplet(const TQString& configFile, Type type, int actions, _filterData = new KURIFilterData(); - _hbox = new TQHBox( 0, 0, WStyle_Customize | WType_Popup ); + _hbox = new TQHBox( 0, 0, (WFlags)(WStyle_Customize | WType_Popup) ); _hbox->setFixedSize(120, 22); } @@ -115,20 +115,20 @@ RunApplet::~RunApplet() void RunApplet::resizeEvent(TQResizeEvent*) { - if(orientation() == Horizontal) + if(orientation() == Qt::Horizontal) { _btn->hide(); _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 @@ -288,7 +288,7 @@ void RunApplet::run_command(const TQString& command) return; hide: - if (orientation() == Vertical) + if (orientation() == Qt::Vertical) _hbox->hide(); needsFocus(focusNeeded); } diff --git a/kicker/applets/swallow/prefwidgetbase.ui b/kicker/applets/swallow/prefwidgetbase.ui index bd2673efa..1d3ef95bf 100644 --- a/kicker/applets/swallow/prefwidgetbase.ui +++ b/kicker/applets/swallow/prefwidgetbase.ui @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp index 7112c706a..d5a231363 100644 --- a/kicker/applets/swallow/swallow.cpp +++ b/kicker/applets/swallow/swallow.cpp @@ -261,7 +261,7 @@ static void parseCommand(KProcess *proc, TQString cmd) cmd += " "; - pos = cmd.find(' '); + pos = cmd.tqfind(' '); *proc << cmd.left(pos); cmd.remove(0,pos); cmd = cmd.stripWhiteSpace(); diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index ad44b640f..e8ab4b567 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -85,7 +85,7 @@ SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int ac setBackgroundOrigin(AncestorOrigin); - kwin_module = new KWinModule(this); + kwin_module = new KWinModule(TQT_TQOBJECT(this)); // kApplication notifies us of settings changes. added to support // disabling of frame effect on mouse hover @@ -228,7 +228,7 @@ void SystemTrayApplet::preferences() for (; it != itEnd; ++it) { TQString name = KWin::windowInfo((*it)->embeddedWinId()).name(); - if(!shownListBox->findItem(name, Qt::ExactMatch | Qt::CaseSensitive)) + if(!shownListBox->tqfindItem(name, TQt::ExactMatch | TQt::CaseSensitive)) { shownListBox->insertItem(KWin::icon((*it)->embeddedWinId(), 22, 22, true), name); } @@ -239,7 +239,7 @@ void SystemTrayApplet::preferences() for (; it != itEnd; ++it) { TQString name = KWin::windowInfo((*it)->embeddedWinId()).name(); - if(!hiddenListBox->findItem(name, Qt::ExactMatch | Qt::CaseSensitive)) + if(!hiddenListBox->tqfindItem(name, TQt::ExactMatch | TQt::CaseSensitive)) { hiddenListBox->insertItem(KWin::icon((*it)->embeddedWinId(), 22, 22, true), name); } @@ -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()); @@ -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) @@ -386,15 +386,15 @@ void SystemTrayApplet::showExpandButton(bool show) m_expandButton->installEventFilter(this); refreshExpandButton(); - if (orientation() == Vertical) + if (orientation() == Qt::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); } @@ -551,8 +551,8 @@ bool SystemTrayApplet::isWinManaged(WId w) bool SystemTrayApplet::shouldHide(WId w) { - return m_hiddenIconList.find(KWin::windowInfo(w).name()) != m_hiddenIconList.end() - || m_hiddenIconList.find('!'+KWin::windowInfo(w,0,NET::WM2WindowClass).windowClassClass()) + return m_hiddenIconList.tqfind(KWin::windowInfo(w).name()) != m_hiddenIconList.end() + || m_hiddenIconList.tqfind('!'+KWin::windowInfo(w,0,NET::WM2WindowClass).windowClassClass()) != m_hiddenIconList.end(); } @@ -628,7 +628,7 @@ void SystemTrayApplet::refreshExpandButton() Qt::ArrowType a; - if (orientation() == Vertical) + if (orientation() == Qt::Vertical) a = m_showHidden ? Qt::DownArrow : Qt::UpArrow; else a = (m_showHidden ^ kapp->reverseLayout()) ? Qt::RightArrow : Qt::LeftArrow; @@ -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); @@ -782,16 +782,16 @@ int SystemTrayApplet::maxIconHeight() const bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e) { - if (watched == m_expandButton) + if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(m_expandButton)) { TQPoint p; if (e->type() == TQEvent::ContextMenu) { - p = static_cast<TQContextMenuEvent*>(e)->globalPos(); + p = TQT_TQCONTEXTMENUEVENT(e)->globalPos(); } else if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* me = static_cast<TQMouseEvent*>(e); + TQMouseEvent* me = TQT_TQMOUSEEVENT(e); if (me->button() == Qt::RightButton) { p = me->globalPos(); @@ -804,7 +804,7 @@ bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e) contextMenu->insertItem(SmallIcon("configure"), i18n("Configure System Tray..."), this, TQT_SLOT(configure())); - contextMenu->exec(static_cast<TQContextMenuEvent*>(e)->globalPos()); + contextMenu->exec(TQT_TQCONTEXTMENUEVENT(e)->globalPos()); delete contextMenu; return true; @@ -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* ) @@ -886,13 +886,13 @@ void SystemTrayApplet::layoutTray() if (m_expandButton) { - if (orientation() == Vertical) + if (orientation() == Qt::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); } } @@ -910,7 +910,7 @@ void SystemTrayApplet::layoutTray() // This fix makes the workarounds in the heightForWidth() and widthForHeight() methods unneeded. // - if (orientation() == Vertical) + if (orientation() == Qt::Vertical) { int iconWidth = maxIconWidth() + ICON_MARGIN; // +2 for the margins that implied by the layout heightWidth = width() - ICON_MARGIN; @@ -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/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp index 55e5d113f..ebeec601f 100644 --- a/kicker/applets/taskbar/taskbarapplet.cpp +++ b/kicker/applets/taskbar/taskbarapplet.cpp @@ -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/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp index 18962b2ea..d363f3879 100644 --- a/kicker/applets/trash/trashapplet.cpp +++ b/kicker/applets/trash/trashapplet.cpp @@ -126,7 +126,7 @@ void TrashApplet::resizeEvent( TQResizeEvent * ) mButton->widthForHeight( height() ) ); - if(orientation() == Vertical) + if(orientation() == Qt::Vertical) { mButton->resize( width(), size ); } diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp index 19e6be02b..166e9164f 100644 --- a/kicker/applets/trash/trashbutton.cpp +++ b/kicker/applets/trash/trashbutton.cpp @@ -32,14 +32,14 @@ #include <konq_popupmenu.h> TrashButton::TrashButton(TQWidget *parent) - : PanelPopupButton(parent), mActions(this, this), + : PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)), mFileItem(KFileItem::Unknown, KFileItem::Unknown, "trash:/") { KIO::UDSEntry entry; KIO::NetAccess::stat("trash:/", entry, 0L); mFileItem.assign(KFileItem(entry, "trash:/")); - KAction *a = KStdAction::paste(this, TQT_SLOT(slotPaste()), + KAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), &mActions, "paste"); a->setShortcut(0); diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index d3b625f80..95dcccbc9 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/kicker/extensions/dockbar/dockbarextension.cpp @@ -57,10 +57,10 @@ DockBarExtension::DockBarExtension(const TQString& configFile, Type type, : KPanelExtension(configFile, type, actions, parent, name) { dragging_container = 0; - kwin_module = new KWinModule(this); + kwin_module = new KWinModule(TQT_TQOBJECT(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()); @@ -174,7 +174,7 @@ void DockBarExtension::layoutContainers() it != containers.constEnd(); ++it) { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) (*it)->move(DockContainer::sz() * i, 0); else (*it)->move(0, DockContainer::sz() * i); @@ -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()) { @@ -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; } @@ -345,17 +345,17 @@ int DockBarExtension::findContainerAtPoint(const TQPoint& p) } void DockBarExtension::mousePressEvent(TQMouseEvent *e ) { - if (e->button() == LeftButton) { + if (e->button() == Qt::LeftButton) { // Store the position of the mouse clic. mclic_pos = e->pos(); - } else if (e->button() == RightButton) { + } else if (e->button() == Qt::RightButton) { int pos = findContainerAtPoint(e->pos()); if (pos != -1) containers.at(pos)->popupMenu(e->globalPos()); } } void DockBarExtension::mouseReleaseEvent(TQMouseEvent *e ) { - if (e->button() != LeftButton) return; + if (e->button() != Qt::LeftButton) return; if (dragging_container) { releaseMouse(); original_container->embed(dragging_container->embeddedWinId()); @@ -366,7 +366,7 @@ void DockBarExtension::mouseReleaseEvent(TQMouseEvent *e ) { } void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) { - if (! (e->state() & LeftButton) ) return; + if (! (e->state() & Qt::LeftButton) ) return; if (dragging_container == 0) { // Check whether the user has moved far enough. int delay = TQApplication::startDragDistance(); @@ -393,7 +393,7 @@ void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) { int pdrag1,pdrag2,psz; pdrag1 = dragpos.x() - barpos.x() + DockContainer::sz()/2; pdrag2 = dragpos.y() - barpos.y() + DockContainer::sz()/2; - if (orientation() == Vertical) { + if (orientation() == Qt::Vertical) { int tmp = pdrag1; pdrag1 = pdrag2; pdrag2 = tmp; psz = height(); } else psz = width(); @@ -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()) { diff --git a/kicker/extensions/dockbar/dockbarextension.h b/kicker/extensions/dockbar/dockbarextension.h index e735ec708..eada2583b 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: diff --git a/kicker/extensions/dockbar/dockcontainer.cpp b/kicker/extensions/dockbar/dockcontainer.cpp index d363b6b30..1d281619a 100644 --- a/kicker/extensions/dockbar/dockcontainer.cpp +++ b/kicker/extensions/dockbar/dockcontainer.cpp @@ -41,9 +41,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. DockContainer::DockContainer( TQString command, TQWidget *parent, TQString resname, TQString resclass, bool undocked_style ) : TQFrame( parent, resname.ascii(), - undocked_style ? WStyle_Customize | + undocked_style ? (WFlags)(WStyle_Customize | WStyle_StaysOnTop | WStyle_Tool | - WStyle_NoBorder | WX11BypassWM : 0 ), + WStyle_NoBorder | WX11BypassWM) : (WFlags)0 ), _embeddedWinId(0), _command(command), _resName(resname), diff --git a/kicker/extensions/dockbar/dockcontainer.h b/kicker/extensions/dockbar/dockcontainer.h index d1968fa28..278b8e450 100644 --- a/kicker/extensions/dockbar/dockcontainer.h +++ b/kicker/extensions/dockbar/dockcontainer.h @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqframe.h> #include <tqvaluevector.h> -class DockContainer : public QFrame +class DockContainer : public TQFrame { Q_OBJECT diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp index d32f0a1dd..d0fb3ef55 100644 --- a/kicker/extensions/kasbar/kasaboutdlg.cpp +++ b/kicker/extensions/kasbar/kasaboutdlg.cpp @@ -118,7 +118,7 @@ void KasAboutDialog::addDemoBar() box->setSpacing( spacingHint() ); box->setMargin( marginHint() ); - KasBar *bar = new KasBar( Horizontal, box ); + KasBar *bar = new KasBar( Qt::Horizontal, box ); bar->setItemSize( KasBar::Large ); bar->setMasked( false ); @@ -131,7 +131,7 @@ void KasAboutDialog::addDemoBar() ci->setCustomPopup( true ); connect( ci, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), ci, TQT_SLOT(togglePopup()) ); - KasBar *groupbar = bar->createChildBar( ( bar->orientation() == Horizontal ) ? Vertical : Horizontal, pop ); + KasBar *groupbar = bar->createChildBar( ( bar->orientation() == Qt::Horizontal ) ? Qt::Vertical : Qt::Horizontal, pop ); KasItem *i = 0; KasClockItem *clk = new KasClockItem( groupbar ); diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp index bf2b64ba3..72dca2567 100644 --- a/kicker/extensions/kasbar/kasbar.cpp +++ b/kicker/extensions/kasbar/kasbar.cpp @@ -80,7 +80,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f ) : TQWidget( parent, name, f ), master_(0), orient( o ), - direction_( o == Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ), + direction_( o == Qt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ), itemUnderMouse_( 0 ), boxesPerLine_(10), // Temp value inDrag( false ), @@ -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,14 +102,14 @@ 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 ) : TQWidget( parent, name, f ), master_(master), orient( o ), - direction_( o == Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ), + direction_( o == Qt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ), itemUnderMouse_( 0 ), boxesPerLine_(10), // Temp value inDrag( false ), @@ -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 ); } } @@ -318,9 +318,9 @@ void KasBar::setDirection( Direction dir ) return; if ( ( dir == TQBoxLayout::LeftToRight ) || ( dir == TQBoxLayout::RightToLeft ) ) - orient = Horizontal; + orient = Qt::Horizontal; else - orient = Vertical; + orient = Qt::Vertical; direction_ = dir; emit directionChanged(); @@ -332,7 +332,7 @@ void KasBar::setOrientation( Orientation o ) if ( orient == o ) return; - if ( o == Horizontal ) + if ( o == Qt::Horizontal ) setDirection( TQBoxLayout::LeftToRight ); else setDirection( TQBoxLayout::TopToBottom ); @@ -375,9 +375,9 @@ 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 ) + if ( o == Qt::Horizontal ) setBoxesPerLine( sz.width() / itemExtent() ); else setBoxesPerLine( sz.height() / itemExtent() ); @@ -396,7 +396,7 @@ TQSize KasBar::sizeHint( Orientation o, TQSize sz ) ++r; TQSize s; - if( o == Horizontal ) { + if( o == Qt::Horizontal ) { s.setWidth( c*itemExtent() ); s.setHeight( r*itemExtent() ); } @@ -434,7 +434,7 @@ void KasBar::updateLayout() ++r; TQSize sz; - if ( orient == Horizontal ) + if ( orient == Qt::Horizontal ) sz = TQSize( c * itemExtent(), r * itemExtent() ); else sz = TQSize( r * itemExtent(), c * itemExtent() ); @@ -445,11 +445,11 @@ void KasBar::updateLayout() setUpdatesEnabled( updates ); - TQWidget *top = topLevelWidget(); + TQWidget *top = tqtopLevelWidget(); TQRegion mask; KasItem *i; - if ( orient == Horizontal ) { + if ( orient == Qt::Horizontal ) { for ( i = items.first(); i; i = items.next() ) { int x = (items.at() % c) * itemExtent(); @@ -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; } diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h index 8ff745475..e1fabddae 100644 --- a/kicker/extensions/kasbar/kasbar.h +++ b/kicker/extensions/kasbar/kasbar.h @@ -77,7 +77,7 @@ typedef TQPtrList<KasItem> KasItemList; /** * The main view for KasBar. */ -class KDE_EXPORT KasBar : public QWidget +class KDE_EXPORT KasBar : public TQWidget { Q_OBJECT Q_PROPERTY( int maxBoxes READ maxBoxes ) @@ -89,8 +89,8 @@ class KDE_EXPORT KasBar : public QWidget friend class KasItem; public: - KasBar( Orientation o, TQWidget *parent=0, const char *name=0, WFlags f=0 ); - KasBar( Orientation o, KasBar *master, + KasBar( Qt::Orientation o, TQWidget *parent=0, const char *name=0, WFlags f=0 ); + KasBar( Qt::Orientation o, KasBar *master, TQWidget* parent=0, const char* name=0, WFlags f=0 ); virtual ~KasBar(); @@ -104,7 +104,7 @@ public: KasBar *master() const { return master_; } /** Creates a child bar of the kasbar. The child will inherit the appearance options. */ - virtual KasBar *createChildBar( Orientation o, TQWidget *parent, const char *name=0 ); + virtual KasBar *createChildBar( Qt::Orientation o, TQWidget *parent, const char *name=0 ); /** Factory method that returns the singleton resources object. */ virtual KasResources *resources(); @@ -121,7 +121,7 @@ public: void clear(); KasItem *take( KasItem *i ) { return items.take( indexOf(i) ); } KasItem *itemAt( uint i ) { return items.at( i ); } - int indexOf( KasItem *i ) { return items.find( i ); } + int indexOf( KasItem *i ) { return items.tqfind( i ); } KasItemList *itemList() { return &items; } @@ -141,8 +141,8 @@ public: int maxBoxes() const { return maxBoxes_; } uint boxesPerLine() const { return boxesPerLine_; } - void setOrientation( Orientation o ); - Orientation orientation() const { return orient; } + void setOrientation( Qt::Orientation o ); + Qt::Orientation orientation() const { return orient; } void setDirection( Direction dir ); Direction direction() const { return direction_; } @@ -152,7 +152,7 @@ public: bool isDrag() const { return inDrag; } - TQSize sizeHint( Orientation, TQSize max ); + TQSize tqsizeHint( Qt::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); @@ -287,7 +287,7 @@ private: TQPixmap offscreen; KasBar *master_; KasItemList items; - Orientation orient; + Qt::Orientation orient; Direction direction_; KasItem *itemUnderMouse_; uint boxesPerLine_; diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp index ffd1b766e..3360b95cb 100644 --- a/kicker/extensions/kasbar/kasbarapp.cpp +++ b/kicker/extensions/kasbar/kasbarapp.cpp @@ -83,12 +83,12 @@ int main( int argc, char **argv ) kdDebug(1345) << "Kasbar starting..." << endl; - int wflags = Qt::WStyle_Customize | Qt::WX11BypassWM | Qt::WStyle_DialogBorder | Qt::WStyle_StaysOnTop; + int wflags = TQt::WStyle_Customize | TQt::WX11BypassWM | TQt::WStyle_DialogBorder | TQt::WStyle_StaysOnTop; KasBar *kasbar; KConfig conf( "kasbarrc" ); if ( args->isSet("test") ) { - kasbar = new KasBar( Qt::Vertical, 0, "testkas", wflags ); + kasbar = new KasBar( Qt::Vertical, 0, "testkas", (TQt::WFlags)wflags ); kasbar->setItemSize( KasBar::Large ); kasbar->append( new KasClockItem(kasbar) ); kasbar->append( new KasItem(kasbar) ); @@ -97,7 +97,7 @@ int main( int argc, char **argv ) kasbar->addTestItems(); } else { - KasTasker *kastasker = new KasTasker( Qt::Vertical, 0, "testkas", wflags ); + KasTasker *kastasker = new KasTasker( Qt::Vertical, 0, "testkas", (TQt::WFlags)wflags ); kastasker->setConfig( &conf ); kastasker->setStandAlone( true ); kasbar = kastasker; diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp index 3bc3dcd1b..c63d6e277 100644 --- a/kicker/extensions/kasbar/kasbarextension.cpp +++ b/kicker/extensions/kasbar/kasbarextension.cpp @@ -121,8 +121,8 @@ void KasBarExtension::setDetached( bool detach ) if ( detach ) { - int wflags = Qt::WStyle_Customize | Qt::WX11BypassWM | Qt::WStyle_DialogBorder | Qt::WStyle_StaysOnTop; - kasbar->reparent( 0, wflags, kasbar->detachedPosition(), true ); + int wflags = TQt::WStyle_Customize | TQt::WX11BypassWM | TQt::WStyle_DialogBorder | TQt::WStyle_StaysOnTop; + kasbar->reparent( 0, (WFlags)wflags, kasbar->detachedPosition(), true ); updateGeometry(); resize( detachedSize() ); } @@ -141,33 +141,33 @@ void KasBarExtension::showEvent( TQShowEvent */*se*/ ) { updateGeometry(); resize( kasbar->size() ); - repaint( true ); + tqrepaint( true ); } TQSize KasBarExtension::detachedSize() { - if ( orientation() == Vertical ) + if ( orientation() == Qt::Vertical ) return TQSize( kasbar->itemExtent()/2, 0 ); else return TQSize( 0, kasbar->itemExtent()/2 ); } -TQSize KasBarExtension::sizeHint(Position p, TQSize maxSize ) const +TQSize KasBarExtension::tqsizeHint(Position p, TQSize maxSize ) const { - Orientation o = Horizontal; + Orientation o = Qt::Horizontal; if ( p == Left || p == Right ) - o = Vertical; + o = Qt::Vertical; if ( detached_ ) { - if ( o == Vertical ) + if ( o == Qt::Vertical ) return TQSize( kasbar->itemExtent()/2, 0 ); else 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..518245d4b 100644 --- a/kicker/extensions/kasbar/kasclockitem.cpp +++ b/kicker/extensions/kasbar/kasclockitem.cpp @@ -23,7 +23,7 @@ #include "kasclockitem.h" #include "kasclockitem.moc" -class LCD : public QLCDNumber +class LCD : public TQLCDNumber { public: LCD( TQWidget *parent, const char *name=0 ) @@ -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 ); @@ -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..12058a3c7 100644 --- a/kicker/extensions/kasbar/kasgroupitem.cpp +++ b/kicker/extensions/kasbar/kasgroupitem.cpp @@ -255,7 +255,7 @@ void KasGroupItem::updatePopup() KasPopup *KasGroupItem::createPopup() { KasPopup *pop = new KasPopup( this ); - bar = kasbar()->createChildBar( ( kasbar()->orientation() == Horizontal ) ? Vertical : Horizontal, pop ); + bar = kasbar()->createChildBar( ( kasbar()->orientation() == Qt::Horizontal ) ? Qt::Vertical : Qt::Horizontal, pop ); connect( pop, TQT_SIGNAL(shown()), TQT_SLOT(updatePopup()) ); diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp index 8fd795363..3c6147b1a 100644 --- a/kicker/extensions/kasbar/kasitem.cpp +++ b/kicker/extensions/kasbar/kasitem.cpp @@ -179,11 +179,11 @@ void KasItem::mouseEnter() void KasItem::mouseReleaseEvent( TQMouseEvent *ev ) { - if ( ev->button() == LeftButton ) + if ( ev->button() == Qt::LeftButton ) emit leftButtonClicked( ev ); - else if ( ev->button() == RightButton ) + else if ( ev->button() == Qt::RightButton ) emit rightButtonClicked( ev ); - else if ( ev->button() == MidButton ) + else if ( ev->button() == Qt::MidButton ) emit middleButtonClicked( ev ); } @@ -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..08f5436d4 100644 --- a/kicker/extensions/kasbar/kasitem.h +++ b/kicker/extensions/kasbar/kasitem.h @@ -74,7 +74,7 @@ class KasPopup; * * @author Richard Moore, [email protected] */ -class KDE_EXPORT KasItem : public QObject +class KDE_EXPORT KasItem : public TQObject { Q_OBJECT @@ -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..0edc0a77a 100644 --- a/kicker/extensions/kasbar/kaspopup.cpp +++ b/kicker/extensions/kasbar/kaspopup.cpp @@ -60,7 +60,7 @@ #include "kaspopup.moc" KasPopup::KasPopup( KasItem *item, const char *name ) - : TQHBox( 0, name, WStyle_Customize | WStyle_StaysOnTop | WStyle_Tool | WStyle_NoBorder | WX11BypassWM ), + : TQHBox( 0, name, (WFlags)(WStyle_Customize | WStyle_StaysOnTop | WStyle_Tool | WStyle_NoBorder | WX11BypassWM) ), item_( item ), kasbar_( item->kasbar() ) { @@ -95,22 +95,22 @@ TQPoint KasPopup::calcPosition( KasItem *item, int w, int h ) int x = pos.x(); int y = pos.y(); - if ( kasbar->orientation() == Horizontal ) { - if ( y < ( qApp->desktop()->height() / 2 ) ) + if ( kasbar->orientation() == Qt::Horizontal ) { + 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/kaspopup.h b/kicker/extensions/kasbar/kaspopup.h index 811202b62..38abbbc28 100644 --- a/kicker/extensions/kasbar/kaspopup.h +++ b/kicker/extensions/kasbar/kaspopup.h @@ -69,7 +69,7 @@ class KasBar; * * @author Richard Moore, [email protected] */ -class KasPopup : public QHBox +class KasPopup : public TQHBox { Q_OBJECT diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp index e81b0aacb..6dd39517f 100644 --- a/kicker/extensions/kasbar/kasprefsdlg.cpp +++ b/kicker/extensions/kasbar/kasprefsdlg.cpp @@ -227,7 +227,7 @@ void KasPrefsDialog::addBackgroundPage() TQLabel *tintStrengthLabel = new TQLabel( i18n("Tint &strength: "), tintAmtBox ); int percent = (int) (kasbar->tintAmount() * 100.0); - tintAmount = new TQSlider( 0, 100, 1, percent, Horizontal, tintAmtBox ); + tintAmount = new TQSlider( 0, 100, 1, percent, Qt::Horizontal, tintAmtBox ); tintAmount->setTracking( true ); connect( tintAmount, TQT_SIGNAL( valueChanged( int ) ), kasbar, TQT_SLOT( setTintAmount( int ) ) ); @@ -261,7 +261,7 @@ void KasPrefsDialog::addThumbsPage() "cause performance problems." ) ); TQLabel *thumbSizeLabel = new TQLabel( i18n("Thumbnail &size: "), thumbSizeBox ); int percent = (int) (kasbar->thumbnailSize() * 100.0); - thumbSizeSlider = new TQSlider( 0, 100, 1, percent, Horizontal, thumbSizeBox ); + thumbSizeSlider = new TQSlider( 0, 100, 1, percent, Qt::Horizontal, thumbSizeBox ); connect( thumbSizeSlider, TQT_SIGNAL( valueChanged( int ) ), kasbar, TQT_SLOT( setThumbnailSize( int ) ) ); thumbSizeLabel->setBuddy( thumbSizeSlider ); 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/kasresources.h b/kicker/extensions/kasbar/kasresources.h index cda153c30..bada9786b 100644 --- a/kicker/extensions/kasbar/kasresources.h +++ b/kicker/extensions/kasbar/kasresources.h @@ -73,7 +73,7 @@ class KasBar; * * @author Richard Moore, [email protected] */ -class KasResources : public QObject +class KasResources : public TQObject { Q_OBJECT diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp index a087f40ff..851b7d915 100644 --- a/kicker/extensions/kasbar/kastasker.cpp +++ b/kicker/extensions/kasbar/kastasker.cpp @@ -152,62 +152,62 @@ KPopupMenu *KasTasker::contextMenu() menu = new KPopupMenu; showAllWindowsAction = new KToggleAction( i18n("Show &All Windows"), KShortcut(), - this, "toggle_show_all_windows" ); + TQT_TQOBJECT(this), "toggle_show_all_windows" ); showAllWindowsAction->setChecked( showAllWindows() ); showAllWindowsAction->plug( menu ); connect( showAllWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowAllWindows(bool)) ); - connect( this, TQT_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQT_SLOT(setChecked(bool)) ); + connect( TQT_TQOBJECT(this), TQT_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQT_SLOT(setChecked(bool)) ); groupWindowsAction = new KToggleAction( i18n("&Group Windows"), KShortcut(), - this, "toggle_group_windows" ); + TQT_TQOBJECT(this), "toggle_group_windows" ); groupWindowsAction->setChecked( groupWindows() ); groupWindowsAction->plug( menu ); connect( groupWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setGroupWindows(bool)) ); - connect( this, TQT_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQT_SLOT(setChecked(bool)) ); + connect( TQT_TQOBJECT(this), TQT_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQT_SLOT(setChecked(bool)) ); - showClockAction = new KToggleAction( i18n("Show &Clock"), KShortcut(), this, "toggle_show_clock" ); + showClockAction = new KToggleAction( i18n("Show &Clock"), KShortcut(), TQT_TQOBJECT(this), "toggle_show_clock" ); showClockAction->setChecked( showClock() ); showClockAction->plug( menu ); connect( showClockAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowClock(bool)) ); - connect( this, TQT_SIGNAL(showClockChanged(bool)), showClockAction, TQT_SLOT(setChecked(bool)) ); + connect( TQT_TQOBJECT(this), TQT_SIGNAL(showClockChanged(bool)), showClockAction, TQT_SLOT(setChecked(bool)) ); - showLoadAction = new KToggleAction( i18n("Show &Load Meter"), KShortcut(), this, "toggle_show_load" ); + showLoadAction = new KToggleAction( i18n("Show &Load Meter"), KShortcut(), TQT_TQOBJECT(this), "toggle_show_load" ); showLoadAction->setChecked( showLoad() ); showLoadAction->plug( menu ); connect( showLoadAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowLoad(bool)) ); - connect( this, TQT_SIGNAL(showLoadChanged(bool)), showLoadAction, TQT_SLOT(setChecked(bool)) ); + connect( TQT_TQOBJECT(this), TQT_SIGNAL(showLoadChanged(bool)), showLoadAction, TQT_SLOT(setChecked(bool)) ); menu->insertSeparator(); if ( !standalone_ ) { - toggleDetachedAction = new KToggleAction( i18n("&Floating"), KShortcut(), this, "toggle_detached" ); + toggleDetachedAction = new KToggleAction( i18n("&Floating"), KShortcut(), TQT_TQOBJECT(this), "toggle_detached" ); toggleDetachedAction->setChecked( isDetached() ); toggleDetachedAction->plug( menu ); connect( toggleDetachedAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setDetached(bool)) ); - connect( this, TQT_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQT_SLOT(setChecked(bool)) ); + connect( TQT_TQOBJECT(this), TQT_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQT_SLOT(setChecked(bool)) ); } rotateBarAction = new KAction( i18n("R&otate Bar"), TQString("rotate"), KShortcut(), - this, TQT_SLOT( toggleOrientation() ), - this, "rotate_bar" ); + TQT_TQOBJECT(this), TQT_SLOT( toggleOrientation() ), + TQT_TQOBJECT(this), "rotate_bar" ); rotateBarAction->plug( menu ); - connect( this, TQT_SIGNAL(detachedChanged(bool)), rotateBarAction, TQT_SLOT(setEnabled(bool)) ); + connect( TQT_TQOBJECT(this), TQT_SIGNAL(detachedChanged(bool)), rotateBarAction, TQT_SLOT(setEnabled(bool)) ); connect( rotateBarAction, TQT_SIGNAL(activated()), TQT_SLOT(writeConfigLater()) ); - menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), this, TQT_SLOT( refreshAll() ) ); + menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), TQT_TQOBJECT(this), TQT_SLOT( refreshAll() ) ); menu->insertSeparator(); - menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), this, TQT_SLOT( showPreferences() ) ); + menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), TQT_TQOBJECT(this), TQT_SLOT( showPreferences() ) ); // Help menu KPopupMenu *help = new KPopupMenu; - help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), this, TQT_SLOT( showAbout() ) ); + help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), TQT_TQOBJECT(this), TQT_SLOT( showAbout() ) ); menu->insertItem( SmallIcon("help"), i18n("&Help"), help ); if ( standalone_ ) { menu->insertSeparator(); - menu->insertItem( SmallIcon("exit"), i18n("&Quit"), qApp, TQT_SLOT( quit() ) ); + menu->insertItem( SmallIcon("exit"), i18n("&Quit"), tqApp, TQT_SLOT( quit() ) ); } } @@ -587,7 +587,7 @@ void KasTasker::readConfig( KConfig *conf ) setItemSize( conf->readNumEntry( "ItemSize", KasBar::Medium ) ); setTint( conf->readBoolEntry( "EnableTint", false ) ); - setTintColor( conf->readColorEntry( "TintColor", &Qt::black ) ); + setTintColor( conf->readColorEntry( "TintColor", &TQt::black ) ); setTintAmount( conf->readDoubleNumEntry( "TintAmount", 0.1 ) ); setTransparent( conf->readBoolEntry( "Transparent", true ) ); setPaintInactiveFrames( conf->readBoolEntry( "PaintInactiveFrames", true ) ); @@ -598,14 +598,14 @@ void KasTasker::readConfig( KConfig *conf ) conf->setGroup("Colors"); KasResources *res = resources(); - res->setLabelPenColor( conf->readColorEntry( "LabelPenColor", &Qt::white ) ); - res->setLabelBgColor( conf->readColorEntry( "LabelBgColor", &Qt::black ) ); - res->setInactivePenColor( conf->readColorEntry( "InactivePenColor", &Qt::black ) ); - res->setInactiveBgColor( conf->readColorEntry( "InactiveBgColor", &Qt::white ) ); - res->setActivePenColor( conf->readColorEntry( "ActivePenColor", &Qt::black ) ); - res->setActiveBgColor( conf->readColorEntry( "ActiveBgColor", &Qt::white ) ); - res->setProgressColor( conf->readColorEntry( "ProgressColor", &Qt::green ) ); - res->setAttentionColor( conf->readColorEntry( "AttentionColor", &Qt::red ) ); + res->setLabelPenColor( conf->readColorEntry( "LabelPenColor", &TQt::white ) ); + res->setLabelBgColor( conf->readColorEntry( "LabelBgColor", &TQt::black ) ); + res->setInactivePenColor( conf->readColorEntry( "InactivePenColor", &TQt::black ) ); + res->setInactiveBgColor( conf->readColorEntry( "InactiveBgColor", &TQt::white ) ); + res->setActivePenColor( conf->readColorEntry( "ActivePenColor", &TQt::black ) ); + res->setActiveBgColor( conf->readColorEntry( "ActiveBgColor", &TQt::white ) ); + res->setProgressColor( conf->readColorEntry( "ProgressColor", &TQt::green ) ); + res->setAttentionColor( conf->readColorEntry( "AttentionColor", &TQt::red ) ); // // Thumbnail Settings @@ -635,7 +635,7 @@ void KasTasker::readConfig( KConfig *conf ) conf->setGroup("Layout"); setDirection( (Direction) conf->readNumEntry( "Direction", TQBoxLayout::LeftToRight ) ); - setOrientation( (Qt::Orientation) conf->readNumEntry( "Orientation", Horizontal ) ); + setOrientation( (Qt::Orientation) conf->readNumEntry( "Orientation", Qt::Horizontal ) ); setMaxBoxes( conf->readUnsignedNumEntry( "MaxBoxes", 0 ) ); TQPoint pos(100, 100); diff --git a/kicker/extensions/kasbar/kastasker.h b/kicker/extensions/kasbar/kastasker.h index b90e4ddeb..d3491ba98 100644 --- a/kicker/extensions/kasbar/kastasker.h +++ b/kicker/extensions/kasbar/kastasker.h @@ -91,14 +91,14 @@ class KDE_EXPORT KasTasker : public KasBar public: /** Create a KasTasker widget. */ - KasTasker( Orientation o, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 ); + KasTasker( Qt::Orientation o, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 ); /** * Create a KasTasker widget that is slaved to another KasTasker. The * created widget will inherit the settings of the parent, but will * not connect to the signals of the TaskManager. */ - KasTasker( Orientation o, KasTasker *master, + KasTasker( Qt::Orientation o, KasTasker *master, TQWidget *parent=0, const char *name=0, WFlags f=0 ); /** Cleans up. */ @@ -107,7 +107,7 @@ public: /** Factory method that returns the default menu for items in the bar. */ virtual KPopupMenu *contextMenu(); - virtual KasTasker *createChildBar( Orientation o, TQWidget *parent, const char *name=0 ); + virtual KasTasker *createChildBar( Qt::Orientation o, TQWidget *parent, const char *name=0 ); /** * Returns true if this is the top KasTasker. Note that it is possible for diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp index c9ec7bdd0..64dda4185 100644 --- a/kicker/extensions/kasbar/kastaskitem.cpp +++ b/kicker/extensions/kasbar/kastaskitem.cpp @@ -135,7 +135,7 @@ TQPixmap KasTaskItem::icon() TQPixmap thumb = task_->thumbnail(); TQSize sz = thumb.size(); - sz.scale( sizes[kasbar()->itemSize()], sizes[kasbar()->itemSize()], TQSize::ScaleMin ); + sz.tqscale( sizes[kasbar()->itemSize()], sizes[kasbar()->itemSize()], TQSize::ScaleMin ); TQImage img = thumb.convertToImage(); img = img.smoothScale( sz ); @@ -390,7 +390,7 @@ void KasTaskItem::showPropertiesDialog() tabs->addTab( createTaskProps( task_, tabs ), i18n("Task") ); tabs->addTab( createTaskProps( this, tabs ), i18n("Item") ); - tabs->addTab( createTaskProps( kasbar(), tabs, false ), i18n("Bar") ); + tabs->addTab( createTaskProps( TQT_TQOBJECT(kasbar()), tabs, false ), i18n("Bar") ); #if 0 tabs->addTab( createNETProps( tabs ), i18n("NET") ); @@ -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); @@ -443,9 +443,9 @@ TQString KasTaskItem::expandMacros( const TQString &format, TQObject *data ) while ( pos >= 0 ) { pos = re.search( s, pos ); if ( pos >= 0 ) { - TQVariant val = data->property( re.cap(1).latin1() ); + TQVariant val = data->property( TQString(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/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..3e29403f4 100644 --- a/kicker/extensions/sidebar/sidebarextension.cpp +++ b/kicker/extensions/sidebar/sidebarextension.cpp @@ -57,7 +57,7 @@ SidebarExtension::SidebarExtension( const TQString& configFile, "konq_sidebar", m_sbWrapper, "SideBar_View", - this, + TQT_TQOBJECT(this), "Sidebar","universal"); KParts::BrowserExtension *be=KParts::BrowserExtension::childObject(p); @@ -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,7 +148,7 @@ 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()); } diff --git a/kicker/extensions/sidebar/sidebarextension.h b/kicker/extensions/sidebar/sidebarextension.h index 4d0d1646b..9f28854b9 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 ); diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp index e0deb768e..56e6ea3ce 100644 --- a/kicker/extensions/taskbar/taskbarextension.cpp +++ b/kicker/extensions/taskbar/taskbarextension.cpp @@ -101,7 +101,7 @@ void TaskBarExtension::positionChange( Position p ) m_container->popupDirectionChange(KPanelApplet::Right); break; case Floating: - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { m_container->popupDirectionChange(KPanelApplet::Down); } @@ -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; @@ -185,7 +185,7 @@ void TaskBarExtension::setBackgroundTheme() { TQImage bgImage = m_bgImage; - if (orientation() == Vertical) + if (orientation() == Qt::Vertical) { if (KickerSettings::rotateBackground()) { @@ -213,7 +213,7 @@ void TaskBarExtension::setBackgroundTheme() { KickerLib::colorize(bgImage); } - setPaletteBackgroundPixmap(bgImage); + setPaletteBackgroundPixmap(TQPixmap(bgImage)); } } 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/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/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/knewbutton.cpp b/kicker/kicker/buttons/knewbutton.cpp index 9c9f438ac..b8144d735 100644 --- a/kicker/kicker/buttons/knewbutton.cpp +++ b/kicker/kicker/buttons/knewbutton.cpp @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqtooltip.h> #include <tqpainter.h> #include <tqcursor.h> -#include <private/qeffects_p.h> +#include <tqeffects_p.h> #include <klocale.h> #include <kapplication.h> @@ -63,14 +63,14 @@ KNewButton::KNewButton( TQWidget* parent ) m_mouseInside = false; m_drag = false; - setIconAlignment((Qt::AlignmentFlags)(AlignTop|AlignRight)); + setIconAlignment((TQ_Alignment)(AlignTop|AlignRight)); setAcceptDrops(true); setIcon("kmenu-suse"); setDrawArrow(false); 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->connectStatus(TQT_TQOBJECT(this), TQT_SLOT(slotStatus(int))); m_movie->connectResize(this, TQT_SLOT(slotSetSize(const TQSize&))); TQApplication::desktop()->screen()->installEventFilter(this); @@ -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; } @@ -134,24 +134,24 @@ void KNewButton::setPopupDirection(KPanelApplet::Direction d) switch (d) { case KPanelApplet::Left: - setIconAlignment((Qt::AlignmentFlags)(AlignTop|AlignLeft)); + setIconAlignment((TQ_Alignment)(AlignTop|AlignLeft)); m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_vertical.mng")); break; case KPanelApplet::Right: - setIconAlignment((Qt::AlignmentFlags)(AlignTop|AlignRight)); + setIconAlignment((TQ_Alignment)(AlignTop|AlignRight)); m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_vertical.mng")); break; case KPanelApplet::Up: - setIconAlignment((Qt::AlignmentFlags)(AlignTop|AlignHCenter)); + setIconAlignment((TQ_Alignment)(AlignTop|AlignHCenter)); m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_basic.mng")); break; case KPanelApplet::Down: - setIconAlignment((Qt::AlignmentFlags)(AlignBottom|AlignHCenter)); + setIconAlignment((TQ_Alignment)(AlignBottom|AlignHCenter)); m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_flipped.mng")); } m_movie->connectUpdate(this, TQT_SLOT(updateMovie())); - m_movie->connectStatus(this, TQT_SLOT(slotStatus(int))); + m_movie->connectStatus(TQT_TQOBJECT(this), TQT_SLOT(slotStatus(int))); m_movie->connectResize(this, TQT_SLOT(slotSetSize(const TQSize&))); } @@ -214,8 +214,8 @@ bool KNewButton::eventFilter(TQObject *o, TQEvent *e) e->type() == TQEvent::MouseButtonPress || e->type() == TQEvent::MouseButtonDblClick ) { - TQMouseEvent *me = static_cast<TQMouseEvent *>(e); - if (rect().contains(mapFromGlobal(me->globalPos()))) + TQMouseEvent *me = TQT_TQMOUSEEVENT(e); + if (TQT_TQRECT_OBJECT(rect()).tqcontains(mapFromGlobal(me->globalPos()))) { if (m_pressedDuringPopup && m_popup && m_openTimer != -1 && (me->button() & Qt::LeftButton) ) @@ -225,8 +225,8 @@ bool KNewButton::eventFilter(TQObject *o, TQEvent *e) if (KickerSettings::kickoffDrawGeekoEye() && e->type() == TQEvent::MouseMove) { - TQMouseEvent *me = static_cast<TQMouseEvent *>(e); - if ((me->state() & MouseButtonMask) == NoButton) + TQMouseEvent *me = TQT_TQMOUSEEVENT(e); + if ((me->state() & Qt::MouseButtonMask) == Qt::NoButton) drawEye(); } @@ -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)); @@ -420,16 +420,16 @@ void KNewButton::slotExecMenu() { switch (popupDirection()) { case KPanelApplet::Left: - qScrollEffect(m_popup, QEffects::LeftScroll); + qScrollEffect(m_popup, TQEffects::LeftScroll); break; case KPanelApplet::Up: - qScrollEffect(m_popup, QEffects::UpScroll); + qScrollEffect(m_popup, TQEffects::UpScroll); break; case KPanelApplet::Right: - qScrollEffect(m_popup, QEffects::RightScroll); + qScrollEffect(m_popup, TQEffects::RightScroll); break; case KPanelApplet::Down: - qScrollEffect(m_popup, QEffects::DownScroll); + qScrollEffect(m_popup, TQEffects::DownScroll); break; } } 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/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp index f5f398136..621038002 100644 --- a/kicker/kicker/core/applethandle.cpp +++ b/kicker/kicker/core/applethandle.cpp @@ -75,14 +75,14 @@ AppletHandle::AppletHandle(AppletContainer* parent) int AppletHandle::heightForWidth( int /* w */ ) const { - int size = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int size = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); return size; } int AppletHandle::widthForHeight( int /* h */ ) const { - int size = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int size = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); return size; } @@ -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 (TQT_TQRECT_OBJECT(w->rect()).tqcontains(w->mapFromGlobal(TQCursor::pos()))) { nowDrawIt = true; } @@ -220,12 +220,12 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) return TQWidget::eventFilter( o, e ); } - else if (o == m_dragBar) + else if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_dragBar)) { if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* ev = static_cast<TQMouseEvent*>(e); - if (ev->button() == LeftButton || ev->button() == MidButton) + TQMouseEvent* ev = TQT_TQMOUSEEVENT(e); + if (ev->button() == Qt::LeftButton || ev->button() == Qt::MidButton) { emit moveApplet(m_applet->mapFromGlobal(ev->globalPos())); } @@ -234,8 +234,8 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) if (m_menuButton && e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* ev = static_cast<TQMouseEvent*>(e); - if (ev->button() == RightButton) + TQMouseEvent* ev = TQT_TQMOUSEEVENT(e); + if (ev->button() == Qt::RightButton) { if (!m_menuButton->isDown()) { @@ -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,11 +308,11 @@ AppletHandleDrag::AppletHandleDrag(AppletHandle* parent) setBackgroundOrigin( AncestorOrigin ); } -TQSize AppletHandleDrag::minimumSizeHint() const +TQSize AppletHandleDrag::tqminimumSizeHint() const { - int wh = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int wh = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); - if (m_parent->orientation() == Horizontal) + if (m_parent->orientation() == Qt::Horizontal) { return TQSize(wh, 0); } @@ -322,7 +322,7 @@ TQSize AppletHandleDrag::minimumSizeHint() const TQSizePolicy AppletHandleDrag::sizePolicy() const { - if (m_parent->orientation() == Horizontal) + if (m_parent->orientation() == Qt::Horizontal) { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred ); } @@ -360,15 +360,15 @@ void AppletHandleDrag::paintEvent(TQPaintEvent *) TQStyle::SFlags flags = TQStyle::Style_Default; flags |= TQStyle::Style_Enabled; - if (m_parent->orientation() == Horizontal) + if (m_parent->orientation() == Qt::Horizontal) { flags |= TQStyle::Style_Horizontal; } TQRect r = rect(); - style().drawPrimitive(TQStyle::PE_DockWindowHandle, &p, r, - colorGroup(), flags); + tqstyle().tqdrawPrimitive(TQStyle::PE_DockWindowHandle, &p, r, + tqcolorGroup(), flags); } else { @@ -382,12 +382,12 @@ AppletHandleButton::AppletHandleButton(AppletHandle *parent) { } -TQSize AppletHandleButton::minimumSizeHint() const +TQSize AppletHandleButton::tqminimumSizeHint() const { - int height = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int height = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); int width = height; - if (m_parent->orientation() == Horizontal) + if (m_parent->orientation() == Qt::Horizontal) { return TQSize(width, height); } diff --git a/kicker/kicker/core/applethandle.h b/kicker/kicker/core/applethandle.h index 5eff46717..a49319dc6 100644 --- a/kicker/kicker/core/applethandle.h +++ b/kicker/kicker/core/applethandle.h @@ -35,7 +35,7 @@ class TQTimer; class AppletHandleDrag; class AppletHandleButton; -class AppletHandle : public QWidget +class AppletHandle : public TQWidget { Q_OBJECT @@ -85,16 +85,16 @@ class AppletHandle : public QWidget bool m_inside; }; -class AppletHandleDrag : public QWidget +class AppletHandleDrag : public TQWidget { Q_OBJECT 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..ad17182b0 100644 --- a/kicker/kicker/core/container_applet.cpp +++ b/kicker/kicker/core/container_applet.cpp @@ -79,7 +79,7 @@ AppletContainer::AppletContainer(const AppletInfo& info, _appletframe->setFrameStyle(TQFrame::NoFrame); _appletframe->installEventFilter(this); - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight, 0, 0); } @@ -92,7 +92,7 @@ AppletContainer::AppletContainer(const AppletInfo& info, _layout->addSpacing(APPLET_MARGIN); _handle = new AppletHandle(this); - _layout->addWidget(_handle, 0); + _layout->addWidget(TQT_TQWIDGET(_handle), 0); connect(_handle, TQT_SIGNAL(moveApplet(const TQPoint&)), this, TQT_SLOT(moveApplet(const TQPoint&))); connect(_handle, TQT_SIGNAL(showAppletMenu()), this, TQT_SLOT(showAppletMenu())); @@ -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(); @@ -191,7 +191,7 @@ void AppletContainer::resetLayout() { _handle->resetLayout(); - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { _layout->setDirection( TQBoxLayout::LeftToRight ); } @@ -225,7 +225,7 @@ void AppletContainer::showAppletMenu() Kicker::the()->setInsertionPoint(_handle->mapToGlobal(_handle->rect().center())); - switch(menu->exec(KickerLib::popupPosition(popupDirection(), menu, _handle))) + switch(menu->exec(KickerLib::popupPosition(popupDirection(), menu, TQT_TQWIDGET(_handle)))) { case PanelAppletOpMenu::Move: moveApplet(_handle->mapToParent(_handle->rect().center())); @@ -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); @@ -298,7 +298,7 @@ void AppletContainer::doSaveConfiguration( KConfigGroup& config, bool layoutOnly ) const { // immutability is checked by ContainerBase - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { config.writeEntry( "WidthForHeightHint", widthForHeight(height()) ); } @@ -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 @@ -471,7 +471,7 @@ void AppletContainer::setImmutable(bool immutable) } else if (!_handle->isVisibleTo(this)) { - TQToolTip::add(_handle, _info.name()); + TQToolTip::add(TQT_TQWIDGET(_handle), _info.name()); _handle->show(); setBackground(); } diff --git a/kicker/kicker/core/container_applet.h b/kicker/kicker/core/container_applet.h index 019e52c96..fea4d92a1 100644 --- a/kicker/kicker/core/container_applet.h +++ b/kicker/kicker/core/container_applet.h @@ -84,7 +84,7 @@ public slots: protected: virtual void doLoadConfiguration( KConfigGroup& ); virtual void doSaveConfiguration( KConfigGroup&, bool layoutOnly ) const; - virtual void alignmentChange(KPanelExtension::Alignment a); + virtual void tqalignmentChange(KPanelExtension::Alignment a); virtual TQPopupMenu* createOpMenu(); diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp index bb3d7d984..2747905cd 100644 --- a/kicker/kicker/core/container_base.cpp +++ b/kicker/kicker/core/container_base.cpp @@ -37,8 +37,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. BaseContainer::BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent, const char * name ) : TQWidget( parent, name ) , _dir(KPanelApplet::Up) - , _orient(Horizontal) - , _alignment(KPanelExtension::LeftTop) + , _orient(Qt::Horizontal) + , _tqalignment(KPanelExtension::LeftTop) , _fspace(0) , _moveOffset(TQPoint(0,0)) , _aid(TQString::null) @@ -72,7 +72,7 @@ void BaseContainer::setImmutable(bool immutable) void BaseContainer::loadConfiguration( KConfigGroup& group ) { - setFreeSpace( QMIN( group.readDoubleNumEntry( "FreeSpace2", 0 ), 1 ) ); + setFreeSpace( TQMIN( group.readDoubleNumEntry( "FreeSpace2", 0 ), 1 ) ); doLoadConfiguration( group ); } @@ -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..078926a07 100644 --- a/kicker/kicker/core/container_base.h +++ b/kicker/kicker/core/container_base.h @@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class KConfigGroup; class TQPopupMenu; -class BaseContainer : public QWidget +class BaseContainer : public TQWidget { Q_OBJECT @@ -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() {} @@ -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*); @@ -111,14 +111,14 @@ protected: virtual void doLoadConfiguration( KConfigGroup& ) {} virtual void doSaveConfiguration( KConfigGroup&, bool /* layoutOnly */ ) const {} - virtual void alignmentChange(KPanelExtension::Alignment) {} + 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..0cd7d6f19 100644 --- a/kicker/kicker/core/container_button.cpp +++ b/kicker/kicker/core/container_button.cpp @@ -215,7 +215,7 @@ void ButtonContainer::dragButton(const TQPixmap icon) bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) { - if (o == _button && e->type() == TQEvent::MouseButtonPress) + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_button) && e->type() == TQEvent::MouseButtonPress) { static bool sentinal = false; @@ -225,10 +225,10 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) } sentinal = true; - TQMouseEvent* me = static_cast<TQMouseEvent*>(e); + TQMouseEvent* me = TQT_TQMOUSEEVENT(e); switch (me->button()) { - case MidButton: + case Qt::MidButton: { if (isImmutable()) { @@ -242,7 +242,7 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) return true; } - case RightButton: + case Qt::RightButton: { if (!kapp->authorizeKAction("kicker_rmb") || isImmutable()) @@ -252,8 +252,8 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) TQPopupMenu* menu = opMenu(); connect( menu, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotMenuClosed() ) ); - TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, this, - (orientation() == Horizontal) ? + TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, TQT_TQWIDGET(this), + (orientation() == Qt::Horizontal) ? TQPoint(0, 0) : me->pos()); Kicker::the()->setInsertionPoint(me->globalPos()); diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 52e85bd7e..0c22245bc 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -70,7 +70,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ExtensionContainer::ExtensionContainer(const AppletInfo& info, const TQString& extensionId, TQWidget *parent) - : TQFrame(parent, ("ExtensionContainer#" + extensionId).latin1(), WStyle_Customize | WStyle_NoBorder), + : TQFrame(parent, ("ExtensionContainer#" + extensionId).latin1(), (WFlags)(WStyle_Customize | WStyle_NoBorder)), m_settings(KSharedConfig::openConfig(info.configFile())), m_hideMode(ManualHide), m_unhideTriggeredAt(UnhideTrigger::None), @@ -97,7 +97,7 @@ ExtensionContainer::ExtensionContainer(KPanelExtension* extension, const AppletInfo& info, const TQString& extensionId, TQWidget *parent) - : TQFrame(parent, ("ExtensionContainer#" + extensionId).latin1(), WStyle_Customize | WStyle_NoBorder), + : TQFrame(parent, ("ExtensionContainer#" + extensionId).latin1(), (WFlags)(WStyle_Customize | WStyle_NoBorder)), m_settings(KSharedConfig::openConfig(info.configFile())), _autoHidden(false), _userHidden(Unhidden), @@ -136,7 +136,7 @@ void ExtensionContainer::init() connect(UnhideTrigger::the(), TQT_SIGNAL(triggerUnhide(UnhideTrigger::Trigger,int)), this, TQT_SLOT(unhideTriggered(UnhideTrigger::Trigger,int))); - _popupWidgetFilter = new PopupWidgetFilter( this ); + _popupWidgetFilter = new PopupWidgetFilter( TQT_TQOBJECT(this) ); connect(_popupWidgetFilter, TQT_SIGNAL(popupWidgetHiding()), TQT_SLOT(maybeStartAutoHideTimer())); // layout @@ -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; @@ -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 }; @@ -488,20 +488,20 @@ void ExtensionContainer::moveMe() // 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; @@ -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); } } @@ -658,7 +658,7 @@ 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 + // We can't just do geometry().tqcontains(TQCursor::pos()) because // now we hide the panel completely off screen. int x = TQCursor::pos().x(); @@ -702,7 +702,7 @@ void ExtensionContainer::autoHideTimeout() { // kdDebug(1210) << "PanelContainer::autoHideTimeout() " << name() << endl; // Hack: If there is a popup open, don't autohide until it closes. - TQWidget* popup = TQApplication::activePopupWidget(); + TQWidget* popup = TQT_TQWIDGET(TQApplication::activePopupWidget()); if (popup) { @@ -732,7 +732,7 @@ void ExtensionContainer::autoHideTimeout() TQRect r = geometry(); 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) @@ -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) @@ -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,7 +965,7 @@ 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 @@ -983,7 +983,7 @@ void ExtensionContainer::updateWindowManager() int w = 0; int h = 0; - TQRect geom = initialGeometry(position(), alignment(), xineramaScreen()); + TQRect geom = initialGeometry(position(), tqalignment(), xineramaScreen()); TQRect virtRect(TQApplication::desktop()->geometry()); TQRect screenRect(TQApplication::desktop()->screenGeometry(xineramaScreen())); @@ -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; @@ -1177,7 +1177,7 @@ int ExtensionContainer::arrangeHideButtons() _layout->setEnabled(false); } - if (orientation() == Vertical) + if (orientation() == Qt::Vertical) { int maxWidth = width(); @@ -1221,11 +1221,11 @@ int ExtensionContainer::arrangeHideButtons() _layout->remove(_ltHB); if (kapp->reverseLayout()) { - _layout->addWidget(_ltHB, 1, 2, vertAlignment); + _layout->addWidget(_ltHB, 1, 2, (TQ_Alignment)vertAlignment); } else { - _layout->addWidget(_ltHB, 1, 0, leftAlignment | vertAlignment); + _layout->addWidget(_ltHB, 1, 0, (TQ_Alignment)(leftAlignment | vertAlignment)); } } @@ -1236,11 +1236,11 @@ int ExtensionContainer::arrangeHideButtons() _layout->remove(_rbHB); if (kapp->reverseLayout()) { - _layout->addWidget(_rbHB, 1, 0, leftAlignment | vertAlignment); + _layout->addWidget(_rbHB, 1, 0, (TQ_Alignment)(leftAlignment | vertAlignment)); } else { - _layout->addWidget(_rbHB, 1, 2, vertAlignment); + _layout->addWidget(_rbHB, 1, 2, (TQ_Alignment)vertAlignment); } } } @@ -1270,7 +1270,7 @@ int ExtensionContainer::setupBorderSpace() TQRect r = TQApplication::desktop()->screenGeometry(xineramaScreen()); TQRect h = geometry(); - if (orientation() == Vertical) + if (orientation() == Qt::Vertical) { if (h.top() > 0) { @@ -1342,7 +1342,7 @@ void ExtensionContainer::updateHighlightColor() { KConfig *config = KGlobal::config(); config->setGroup("WM"); - TQColor color = TQApplication::palette().active().highlight(); + TQColor color = TQApplication::tqpalette().active().highlight(); m_highlightColor = config->readColorEntry("activeBackground", &color); update(); } @@ -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) @@ -1482,7 +1482,7 @@ void ExtensionContainer::arrange(KPanelExtension::Position p, if (a != m_settings.alignment()) { m_settings.setAlignment(a); - setAlignment(a); + tqsetAlignment(a); } if (XineramaScreen != xineramaScreen()) @@ -1504,11 +1504,11 @@ KPanelExtension::Orientation ExtensionContainer::orientation() const { if (position() == KPanelExtension::Top || position() == KPanelExtension::Bottom) { - return Horizontal; + return Qt::Horizontal; } else { - return Vertical; + return Qt::Vertical; } } @@ -1521,7 +1521,7 @@ 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. @@ -1553,7 +1553,7 @@ void ExtensionContainer::resetLayout() haveToArrangeButtons = true; } - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { _ltHB->setArrowType(Qt::LeftArrow); _ltHB->setFixedSize(m_settings.hideButtonSize(), height()); @@ -1584,7 +1584,7 @@ void ExtensionContainer::resetLayout() haveToArrangeButtons = true; } - if ( orientation() == Horizontal) + if ( orientation() == Qt::Horizontal) { _rbHB->setArrowType(Qt::RightArrow); _rbHB->setFixedSize(m_settings.hideButtonSize(), height()); @@ -1631,7 +1631,7 @@ void ExtensionContainer::resetLayout() updateGeometry(); int endBorderWidth = haveToArrangeButtons ? arrangeHideButtons() : setupBorderSpace(); - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { if (m_extension) { @@ -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; @@ -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()); } @@ -1986,13 +1986,13 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) { case TQEvent::MouseButtonPress: { - TQMouseEvent* me = static_cast<TQMouseEvent*>(e); - if ( me->button() == LeftButton ) + TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + if ( me->button() == Qt::LeftButton ) { _last_lmb_press = me->globalPos(); _is_lmb_down = true; } - else if (me->button() == RightButton) + else if (me->button() == Qt::RightButton) { showPanelMenu(me->globalPos()); return true; // don't crash! @@ -2002,8 +2002,8 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) case TQEvent::MouseButtonRelease: { - TQMouseEvent* me = static_cast<TQMouseEvent*>(e); - if ( me->button() == LeftButton ) + TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + if ( me->button() == Qt::LeftButton ) { _is_lmb_down = false; } @@ -2014,7 +2014,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) { TQMouseEvent* me = (TQMouseEvent*) e; if (_is_lmb_down && - ((me->state() & LeftButton) == LeftButton) && + ((me->state() & Qt::LeftButton) == Qt::LeftButton) && !Kicker::the()->isImmutable() && !m_settings.config()->isImmutable() && !ExtensionManager::the()->isMenuBar(this)) diff --git a/kicker/kicker/core/container_extension.h b/kicker/kicker/core/container_extension.h index 8eedd4e6f..fdb3be989 100644 --- a/kicker/kicker/core/container_extension.h +++ b/kicker/kicker/core/container_extension.h @@ -49,7 +49,7 @@ class PopupWidgetFilter; class PanelExtensionOpMenu; class TQColor; -class ExtensionContainer : public QFrame +class ExtensionContainer : public TQFrame { Q_OBJECT @@ -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(); @@ -198,7 +198,7 @@ private: TQColor m_highlightColor; }; -class PopupWidgetFilter : public QObject +class PopupWidgetFilter : public TQObject { Q_OBJECT diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index 8fd839a20..38e0f844b 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/kicker/kicker/core/containerarea.cpp @@ -314,7 +314,7 @@ void ContainerArea::loadContainers(const TQStringList& containers) BaseContainer* a = 0; - int sep = appletId.findRev('_'); + int sep = appletId.tqfindRev('_'); Q_ASSERT(sep != -1); TQString appletType = appletId.left(sep); @@ -923,7 +923,7 @@ void ContainerArea::startContainerMove(BaseContainer *a) KickerTip::enableTipping(false); emit maintainFocus(true); setMouseTracking(true); - grabMouse(sizeAllCursor); + grabMouse(tqsizeAllCursor); m_layout->setStretchEnabled(false); a->raise(); @@ -940,7 +940,7 @@ void ContainerArea::mouseReleaseEvent(TQMouseEvent *) // so we need to complete the move here _autoScrollTimer.stop(); releaseMouse(); - setCursor(arrowCursor); + setCursor(tqarrowCursor); setMouseTracking(false); _moveAC->completeMoveOperation(); @@ -962,12 +962,12 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev) return; } - if (ev->state() == LeftButton && !rect().contains(ev->pos())) + if (ev->state() == Qt::LeftButton && !TQT_TQRECT_OBJECT(rect()).tqcontains(ev->pos())) { // leaveEvent() doesn't work, while grabbing the mouse _autoScrollTimer.stop(); releaseMouse(); - setCursor(arrowCursor); + setCursor(tqarrowCursor); setMouseTracking(false); _moveAC->completeMoveOperation(); @@ -986,7 +986,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev) return; } - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { int oldX = _moveAC->x() + _moveAC->moveOffset().x(); int x = ev->pos().x() + contentsX(); @@ -1082,7 +1082,7 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev) preferedHeight = draggedContainer->heightForWidth(width()); } - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { _dragIndicator->setPreferredSize(TQSize(preferedWidth, height())); } @@ -1103,9 +1103,9 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev) --it; BaseContainer* a = *it; - if ((orientation() == Horizontal && + if ((orientation() == Qt::Horizontal && a->x() < (ev->pos().x() + contentsX()) - _dragMoveOffset.x()) || - (orientation() == Vertical && + (orientation() == Qt::Vertical && a->y() < (ev->pos().y() + contentsY()) - _dragMoveOffset.y())) { _dragMoveAC = a; @@ -1114,7 +1114,7 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev) } while (it != m_containers.begin()); } - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { moveDragIndicator(ev->pos().x() + contentsX() - _dragMoveOffset.x()); } @@ -1139,11 +1139,11 @@ 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) + if (orientation() == Qt::Horizontal) { m_layout->moveContainerSwitch(_moveAC, ev->pos().x() + contentsX() - _moveAC->x()); } @@ -1159,7 +1159,7 @@ void ContainerArea::dragMoveEvent(TQDragMoveEvent* ev) return; } - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { moveDragIndicator(ev->pos().x() + contentsX() - _dragMoveOffset.x()); } @@ -1200,22 +1200,22 @@ void ContainerArea::dropEvent(TQDropEvent *ev) return; } - TQObject *parent = ev->source() ? ev->source()->parent() : 0; - while (parent && (parent != this)) + TQObject *parent = ev->source() ? ev->source()->tqparent() : 0; + while (parent && (TQT_BASE_OBJECT(parent) != TQT_BASE_OBJECT(this))) { - parent = parent->parent(); + parent = parent->tqparent(); } if (parent) { // Move container a - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { int oldX = a->x(); int x = _dragIndicator->x(); m_layout->moveContainerSwitch(a, x - oldX); } - else if (orientation() == Vertical) + else if (orientation() == Qt::Vertical) { int oldY = a->y(); int y = _dragIndicator->y(); @@ -1387,7 +1387,7 @@ bool ContainerArea::eventFilter(TQObject* o, TQEvent* e) // which contain a ContainerArea can react to layout 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 (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_contents)) { if (e->type() == TQEvent::LayoutHint) { @@ -1408,7 +1408,7 @@ void ContainerArea::resizeEvent(TQResizeEvent *ev) void ContainerArea::viewportResizeEvent(TQResizeEvent* ev) { Panner::viewportResizeEvent(ev); - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { m_contents->resize(kMax(widthForHeight(ev->size().height()), ev->size().width()), @@ -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; @@ -1481,7 +1481,7 @@ void ContainerArea::setBackground() { TQImage bgImage = srcImage; - if (orientation() == Vertical) + if (orientation() == Qt::Vertical) { if (KickerSettings::rotateBackground()) { @@ -1542,7 +1542,7 @@ TQRect ContainerArea::availableSpaceFollowing(BaseContainer* a) if (a) { - BaseContainer::Iterator it = m_containers.find(a); + BaseContainer::Iterator it = m_containers.tqfind(a); if (it != m_containers.end() && ++it != m_containers.end()) { @@ -1559,7 +1559,7 @@ TQRect ContainerArea::availableSpaceFollowing(BaseContainer* a) } } - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { if (a) { @@ -1593,7 +1593,7 @@ void ContainerArea::moveDragIndicator(int pos) // Move _dragIndicator to position pos, restricted by availableSpace. // Resize _dragIndicator if necessary. - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { if (availableSpace.size().width() < _dragIndicator->preferredSize().width()) @@ -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); @@ -1690,7 +1690,7 @@ void ContainerArea::setPosition(KPanelExtension::Position p) // when that gets called AFTER we've been moved // it's not always safe to do the resize here, as scroll buttons // from the panner may get in our way. =/ - if (o == Horizontal) + if (o == Qt::Horizontal) { resizeContents(0, height()); } @@ -1718,17 +1718,17 @@ void ContainerArea::setPosition(KPanelExtension::Position p) 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); } } @@ -1736,7 +1736,7 @@ void ContainerArea::autoScroll() { if(!_moveAC) return; - if(orientation() == Horizontal) { + if(orientation() == Qt::Horizontal) { if(_moveAC->pos().x() <= 80) scrollBy(-10, 0); else if(_moveAC->pos().x() >= width() - _moveAC->width() - 80) @@ -1784,7 +1784,7 @@ void ContainerArea::updateContainersBackground() // properly, so just cache the geometry and update background only when // the geometry 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())); @@ -1894,9 +1894,9 @@ TQStringList ContainerArea::listContainers() const return m_layout->listItems(); } -void ContainerArea::repaint() +void ContainerArea::tqrepaint() { - Panner::repaint(); + Panner::tqrepaint(); } void ContainerArea::showAddAppletDialog() @@ -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() ); + tqstyle().tqdrawPrimitive( 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..f8532b511 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(); @@ -172,7 +172,7 @@ private: }; -class DragIndicator : public QWidget +class DragIndicator : public TQWidget { Q_OBJECT diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp index 4ae63077e..301011688 100644 --- a/kicker/kicker/core/containerarealayout.cpp +++ b/kicker/kicker/core/containerarealayout.cpp @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "container_applet.h" #include "container_button.h" -class ContainerAreaLayoutIterator : public QGLayoutIterator +class ContainerAreaLayoutIterator : public TQGLayoutIterator { public: ContainerAreaLayoutIterator(ContainerAreaLayout::ItemList *l) @@ -72,7 +72,6 @@ class ContainerAreaLayoutIterator : public QGLayoutIterator ContainerAreaLayout::ItemList* m_list; }; - int ContainerAreaLayoutItem::heightForWidth(int w) const { BaseContainer* container = dynamic_cast<BaseContainer*>(item->widget()); @@ -82,7 +81,7 @@ int ContainerAreaLayoutItem::heightForWidth(int w) const } else { - return item->sizeHint().height(); + return item->tqsizeHint().height(); } } @@ -95,7 +94,7 @@ int ContainerAreaLayoutItem::widthForHeight(int h) const } else { - return item->sizeHint().width(); + return item->tqsizeHint().width(); } } @@ -140,7 +139,7 @@ void ContainerAreaLayoutItem::setGeometryR(const TQRect& r) int ContainerAreaLayoutItem::widthForHeightR(int h) const { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { return widthForHeight(h); } @@ -152,7 +151,7 @@ int ContainerAreaLayoutItem::widthForHeightR(int h) const int ContainerAreaLayoutItem::widthR() const { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { return geometry().width(); } @@ -164,7 +163,7 @@ int ContainerAreaLayoutItem::widthR() const int ContainerAreaLayoutItem::heightR() const { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { return geometry().height(); } @@ -176,7 +175,7 @@ int ContainerAreaLayoutItem::heightR() const int ContainerAreaLayoutItem::leftR() const { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { if (TQApplication::reverseLayout()) return m_layout->geometry().right() - geometry().right(); @@ -191,7 +190,7 @@ int ContainerAreaLayoutItem::leftR() const int ContainerAreaLayoutItem::rightR() const { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { if (TQApplication::reverseLayout()) return m_layout->geometry().right() - geometry().left(); @@ -207,14 +206,46 @@ int ContainerAreaLayoutItem::rightR() const ContainerAreaLayout::ContainerAreaLayout(TQWidget* parent) : TQLayout(parent), - m_orientation(Horizontal), + m_orientation(Qt::Horizontal), m_stretchEnabled(true) { } -void ContainerAreaLayout::addItem(TQLayoutItem* item) +#ifdef USE_QT4 +/*! + \reimp +*/ +int ContainerAreaLayout::count() const { + return m_items.count(); +} + +/*! + \reimp +*/ +TQLayoutItem* ContainerAreaLayout::itemAt(int index) const { + return index >= 0 && index < m_items.count() ? (*m_items.at(index))->item : 0; +} + +/*! + \reimp +*/ +TQLayoutItem* ContainerAreaLayout::takeAt(int index) { + if (index < 0 || index >= m_items.count()) + return 0; + ContainerAreaLayoutItem *b = *m_items.at(index); + m_items.remove(m_items.at(index)); + TQLayoutItem *item = b->item; + b->item = 0; + delete b; + + invalidate(); + return item; +} +#endif // USE_QT4 + +void ContainerAreaLayout::addItem(QLayoutItem* item) { - m_items.append(new ContainerAreaLayoutItem(item, this)); + m_items.append(new ContainerAreaLayoutItem(static_cast<TQLayoutItem*>(item), this)); } void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertionPoint) @@ -252,7 +283,7 @@ void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertio return; } - int insPos = (orientation() == Horizontal) ? insertionPoint.x(): insertionPoint.y(); + int insPos = (orientation() == Qt::Horizontal) ? insertionPoint.x(): insertionPoint.y(); Item* current = *currentIt; Item* next = *nextIt; @@ -319,7 +350,7 @@ void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertio if (current) { m_items.erase(m_items.fromLast()); - ItemList::iterator insertIt = m_items.find(current); + ItemList::iterator insertIt = m_items.tqfind(current); if (insertIt == m_items.begin()) { @@ -384,11 +415,11 @@ 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); - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { return TQSize(widthForHeight(size), size); } @@ -398,11 +429,11 @@ TQSize ContainerAreaLayout::sizeHint() const } } -TQSize ContainerAreaLayout::minimumSize() const +TQSize ContainerAreaLayout::tqminimumSize() const { const int size = KickerLib::sizeValue(KPanelExtension::SizeTiny); - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { return TQSize(widthForHeight(size), size); } @@ -414,12 +445,18 @@ TQSize ContainerAreaLayout::minimumSize() const TQLayoutIterator ContainerAreaLayout::iterator() { + // [FIXME] +#ifdef USE_QT4 + #warning [FIXME] ContainerAreaLayout iterators may not function correctly under Qt4 + return TQLayoutIterator(this); // [FIXME] +#else // USE_QT4 return TQLayoutIterator(new ContainerAreaLayoutIterator(&m_items)); +#endif // USE_QT4 } void ContainerAreaLayout::setGeometry(const TQRect& rect) { - //RESEARCH: when can we short curcuit this? + //RESEARCH: when can we short circuit this? // maybe a dirty flag to be set when we have containers // that needs laying out? @@ -522,7 +559,7 @@ int ContainerAreaLayout::distanceToPreviousItem(ItemList::const_iterator it) con void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance) { - const bool horizontal = orientation() == Horizontal; + const bool horizontal = orientation() == Qt::Horizontal; const bool reverseLayout = TQApplication::reverseLayout(); if (horizontal && reverseLayout) @@ -588,7 +625,7 @@ void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance) : kMin(newPos, last->leftR() - moving->widthR()); // Move 'moving' to its new position in the container list. - ItemList::iterator itMoving = m_items.find(moving); + ItemList::iterator itMoving = m_items.tqfind(moving); if (itMoving != m_items.end()) { @@ -659,7 +696,7 @@ void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance) int ContainerAreaLayout::moveContainerPush(TQWidget* a, int distance) { - const bool horizontal = orientation() == Horizontal; + const bool horizontal = orientation() == Qt::Horizontal; const bool reverseLayout = TQApplication::reverseLayout(); // Get the iterator 'it' pointing to the layoutitem representing 'a'. @@ -730,7 +767,7 @@ int ContainerAreaLayout::moveContainerPushRecursive(ItemList::const_iterator it, TQRect ContainerAreaLayout::transform(const TQRect& r) const { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { if (TQApplication::reverseLayout()) { @@ -751,7 +788,7 @@ TQRect ContainerAreaLayout::transform(const TQRect& r) const int ContainerAreaLayout::widthForHeightR(int h) const { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { return widthForHeight(h); } @@ -763,7 +800,7 @@ int ContainerAreaLayout::widthForHeightR(int h) const int ContainerAreaLayout::widthR() const { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { return geometry().width(); } @@ -775,7 +812,7 @@ int ContainerAreaLayout::widthR() const int ContainerAreaLayout::heightR() const { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { return geometry().height(); } @@ -787,7 +824,7 @@ int ContainerAreaLayout::heightR() const int ContainerAreaLayout::leftR() const { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) return geometry().left(); else return geometry().top(); @@ -795,7 +832,7 @@ int ContainerAreaLayout::leftR() const int ContainerAreaLayout::rightR() const { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) return geometry().right(); else return geometry().bottom(); diff --git a/kicker/kicker/core/containerarealayout.h b/kicker/kicker/core/containerarealayout.h index 995497268..d91113660 100644 --- a/kicker/kicker/core/containerarealayout.h +++ b/kicker/kicker/core/containerarealayout.h @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class ContainerAreaLayout; -class ContainerAreaLayoutItem : public Qt +class ContainerAreaLayoutItem : public TQt { public: ContainerAreaLayoutItem(TQLayoutItem* i, ContainerAreaLayout* layout) @@ -71,7 +71,7 @@ class ContainerAreaLayoutItem : public Qt ContainerAreaLayout* m_layout; }; -class ContainerAreaLayout : public QLayout +class ContainerAreaLayout : public TQLayout { public: typedef ContainerAreaLayoutItem Item; @@ -79,12 +79,12 @@ class ContainerAreaLayout : public QLayout ContainerAreaLayout(TQWidget* parent); - void addItem(TQLayoutItem* item); + void addItem(QLayoutItem* item); 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); @@ -108,6 +108,12 @@ class ContainerAreaLayout : public QLayout int leftR() const; int rightR() const; +#ifdef USE_QT4 + + QLAYOUT_REQUIRED_METHOD_DECLARATIONS + +#endif // USE_QT4 + private: int moveContainerPushRecursive(ItemList::const_iterator it, int distance); int distanceToPreviousItem(ItemList::const_iterator it) const; diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp index e0f68ce8a..7921c636d 100644 --- a/kicker/kicker/core/extensionmanager.cpp +++ b/kicker/kicker/core/extensionmanager.cpp @@ -140,7 +140,7 @@ void ExtensionManager::initialize() TQString extensionId(*it); // create a matching applet container - if (extensionId.find("Extension") == -1) + if (extensionId.tqfind("Extension") == -1) { continue; } @@ -259,7 +259,7 @@ void ExtensionManager::migrateMenubar() { TQString extensionId(*it); - if (extensionId.find("Extension") == -1) + if (extensionId.tqfind("Extension") == -1) { continue; } @@ -291,12 +291,12 @@ void ExtensionManager::migrateMenubar() } KConfigGroup group(&extensionConfig, appletId.latin1()); - TQString appletType = appletId.left(appletId.findRev('_')); + TQString appletType = appletId.left(appletId.tqfindRev('_')); if (appletType == "Applet") { TQString appletFile = group.readPathEntry("DesktopFile"); - if (appletFile.find("menuapplet.desktop") != -1) + if (appletFile.tqfind("menuapplet.desktop") != -1) { TQString menubarConfig = locate("config", extension); KIO::NetAccess::copy(menubarConfig, @@ -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()), @@ -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 diff --git a/kicker/kicker/core/extensionmanager.h b/kicker/kicker/core/extensionmanager.h index 6de7b35e1..47db7006e 100644 --- a/kicker/kicker/core/extensionmanager.h +++ b/kicker/kicker/core/extensionmanager.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. const int XineramaAllScreens = -2; -class ExtensionManager : public QObject +class ExtensionManager : public TQObject { Q_OBJECT diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp index d91e1eaf9..ce7de00c0 100644 --- a/kicker/kicker/core/kicker.cpp +++ b/kicker/kicker/core/kicker.cpp @@ -115,7 +115,7 @@ Kicker::Kicker() // initialize our keys // note that this creates the KMenu by calling MenuManager::the() - keys = new KGlobalAccel( this ); + keys = new KGlobalAccel( TQT_TQOBJECT(this) ); #define KICKER_ALL_BINDINGS #include "kickerbindings.cpp" keys->readSettings(); @@ -199,7 +199,7 @@ void Kicker::paletteChanged() { KConfigGroup c(KGlobal::config(), "General"); KickerSettings::setTintColor(c.readColorEntry("TintColor", - &palette().active().mid())); + &tqpalette().active().mid())); KickerSettings::self()->writeConfig(); } diff --git a/kicker/kicker/core/kickerbindings.cpp b/kicker/kicker/core/kickerbindings.cpp index bc62df231..46cfa432d 100644 --- a/kicker/kicker/core/kickerbindings.cpp +++ b/kicker/kicker/core/kickerbindings.cpp @@ -23,10 +23,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef NOSLOTS # define DEF( name, key3, key4, target, fnSlot ) \ - keys->insert( name, i18n(name), TQString::null, key3, key4, target, TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(target), TQT_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, target, fnSlot ) \ - keys->insert( name, i18n(name), TQString::null, key3, key4 ) + keys->insert( name, i18n(name), TQString(), key3, key4 ) #endif #define WIN KKey::QtWIN diff --git a/kicker/kicker/core/kmenubase.ui b/kicker/kicker/core/kmenubase.ui index 1adb59b38..8a86f366d 100644 --- a/kicker/kicker/core/kmenubase.ui +++ b/kicker/kicker/core/kmenubase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KMenuBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KMenu</cstring> </property> @@ -21,7 +21,7 @@ <property name="frameShape" stdset="0"> <string>MShape</string> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>m_search</cstring> </property> @@ -43,7 +43,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>m_searchFrame</cstring> </property> @@ -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> @@ -80,7 +80,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout18</cstring> </property> @@ -88,7 +88,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_searchLabel</cstring> </property> @@ -117,7 +117,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_searchPixmap</cstring> </property> @@ -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> @@ -174,7 +174,7 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>m_footer</cstring> </property> @@ -196,7 +196,7 @@ <property name="spacing"> <number>4</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_userInfo</cstring> </property> @@ -222,14 +222,14 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>10</width> <height>20</height> </size> </property> </spacer> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_branding</cstring> </property> @@ -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> diff --git a/kicker/kicker/core/kmenubase.ui.h b/kicker/kicker/core/kmenubase.ui.h index e1ed1ac25..492ae4aab 100644 --- a/kicker/kicker/core/kmenubase.ui.h +++ b/kicker/kicker/core/kmenubase.ui.h @@ -5,5 +5,5 @@ void KMenuBase::init() XSetWindowAttributes attrs; attrs.override_redirect = True; XChangeWindowAttributes( qt_xdisplay(), winId(), CWOverrideRedirect, &attrs ); - setWFlags( Qt::WType_Popup ); + setWFlags( (WFlags)TQt::WType_Popup ); } diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp index 76e94a0e3..44d891f1e 100644 --- a/kicker/kicker/core/main.cpp +++ b/kicker/kicker/core/main.cpp @@ -73,7 +73,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) XCloseDisplay(dpy); dpy = 0; - if ((pos = display_name.findRev('.')) != -1) + if ((pos = display_name.tqfindRev('.')) != -1) display_name.remove(pos, 10); TQCString env; diff --git a/kicker/kicker/core/menumanager.cpp b/kicker/kicker/core/menumanager.cpp index 61110de14..776056647 100644 --- a/kicker/kicker/core/menumanager.cpp +++ b/kicker/kicker/core/menumanager.cpp @@ -156,8 +156,8 @@ void MenuManager::kmenuAccelActivated() r = desktop->geometry(); 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,15 +170,15 @@ 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()); // let's unhide the panel while we're at it. traverse the widget // hierarchy until we find the panel, if any - TQObject* menuParent = button->parent(); + TQObject* menuParent = button->tqparent(); while (menuParent) { ExtensionContainer* ext = dynamic_cast<ExtensionContainer*>(menuParent); @@ -188,11 +188,11 @@ 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; } - menuParent = menuParent->parent(); + menuParent = menuParent->tqparent(); } button->showMenu(); } diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp index 2bd70c82b..d11c14c28 100644 --- a/kicker/kicker/core/panelextension.cpp +++ b/kicker/kicker/core/panelextension.cpp @@ -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; @@ -162,7 +162,7 @@ bool PanelExtension::eventFilter(TQObject*, TQEvent * e) if ( e->type() == TQEvent::MouseButtonPress ) { TQMouseEvent* me = (TQMouseEvent*) e; - if ( me->button() == RightButton && kapp->authorize("action/kicker_rmb")) + if ( me->button() == Qt::RightButton && kapp->authorize("action/kicker_rmb")) { Kicker::the()->setInsertionPoint(me->globalPos()); opMenu()->exec(me->globalPos()); 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/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp index 81975ccae..86270db62 100644 --- a/kicker/kicker/core/pluginmanager.cpp +++ b/kicker/kicker/core/pluginmanager.cpp @@ -159,7 +159,7 @@ KPanelApplet* PluginManager::loadApplet(const AppletInfo& info, if (applet) { - _dict.insert( applet, new AppletInfo( info ) ); + _dict.insert( TQT_TQOBJECT(applet), new AppletInfo( info ) ); connect( applet, TQT_SIGNAL( destroyed( TQObject* ) ), TQT_SLOT( slotPluginDestroyed( TQObject* ) ) ); } @@ -197,7 +197,7 @@ KPanelExtension* PluginManager::loadExtension( KPanelExtension* extension = init_ptr( parent, info.configFile() ); if( extension ) { - _dict.insert( extension, new AppletInfo( info ) ); + _dict.insert( TQT_TQOBJECT(extension), new AppletInfo( info ) ); connect( extension, TQT_SIGNAL( destroyed( TQObject* ) ), TQT_SLOT( slotPluginDestroyed( TQObject* ) ) ); } @@ -272,7 +272,7 @@ AppletContainer* PluginManager::createAppletContainer( return 0; } - bool untrusted = m_untrustedApplets.find(desktopFile) != m_untrustedApplets.end(); + bool untrusted = m_untrustedApplets.tqfind(desktopFile) != m_untrustedApplets.end(); if (isStartup && untrusted) { // don't load extensions that bombed on us previously! @@ -325,7 +325,7 @@ ExtensionContainer* PluginManager::createExtensionContainer(const TQString& desk if (!internal) { - bool untrusted = m_untrustedExtensions.find(desktopFile) != m_untrustedExtensions.end(); + bool untrusted = m_untrustedExtensions.tqfind(desktopFile) != m_untrustedExtensions.end(); if (isStartup && untrusted) { // don't load extensions that bombed on us previously! @@ -365,7 +365,7 @@ LibUnloader::LibUnloader( const TQString &libName, TQObject *parent ) void LibUnloader::unload( const TQString &libName ) { - (void)new LibUnloader( libName, kapp ); + (void)new LibUnloader( libName, TQT_TQOBJECT(kapp) ); } void LibUnloader::unload() diff --git a/kicker/kicker/core/pluginmanager.h b/kicker/kicker/core/pluginmanager.h index cb5e0a89f..f67c13490 100644 --- a/kicker/kicker/core/pluginmanager.h +++ b/kicker/kicker/core/pluginmanager.h @@ -38,7 +38,7 @@ class KPanelApplet; class KPanelExtension; class TQPopupMenu; -class KDE_EXPORT PluginManager : public QObject +class KDE_EXPORT PluginManager : public TQObject { Q_OBJECT @@ -88,7 +88,7 @@ private: TQStringList m_untrustedExtensions; }; -class LibUnloader : public QObject +class LibUnloader : public TQObject { Q_OBJECT public: diff --git a/kicker/kicker/core/showdesktop.h b/kicker/kicker/core/showdesktop.h index 8d4d2546c..88cc7d7c7 100644 --- a/kicker/kicker/core/showdesktop.h +++ b/kicker/kicker/core/showdesktop.h @@ -31,7 +31,7 @@ class KWinModule; /** * Singleton class that handles desktop access (minimizing all windows) */ -class ShowDesktop : public QObject +class ShowDesktop : public TQObject { Q_OBJECT diff --git a/kicker/kicker/core/userrectsel.cpp b/kicker/kicker/core/userrectsel.cpp index d4b54f04a..d48c43aad 100644 --- a/kicker/kicker/core/userrectsel.cpp +++ b/kicker/kicker/core/userrectsel.cpp @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "userrectsel.moc" UserRectSel::UserRectSel(const RectList& rects, const TQPoint& _offset, const TQColor& color) - : TQWidget(0, 0, WStyle_Customize | WX11BypassWM), + : TQWidget(0, 0, (WFlags)(WStyle_Customize | WX11BypassWM)), rectangles(rects), offset(_offset) { @@ -46,9 +46,9 @@ UserRectSel::~UserRectSel() void UserRectSel::mouseReleaseEvent(TQMouseEvent * e) { - if (e->button() == LeftButton) + if (e->button() == Qt::LeftButton) { - qApp->exit_loop(); + tqApp->exit_loop(); } } @@ -88,12 +88,12 @@ void UserRectSel::paintCurrent() { for (i = 0; i < 4; i++) { - _frame[i] = new TQWidget(0, 0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WX11BypassWM); + _frame[i] = new TQWidget(0, 0, (WFlags)(WStyle_Customize | WStyle_NoBorder | WX11BypassWM)); _frame[i]->setPaletteBackgroundColor(Qt::black); } for (i = 4; i < 8; i++) { - _frame[i] = new TQWidget(0, 0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WX11BypassWM); + _frame[i] = new TQWidget(0, 0, (WFlags)(WStyle_Customize | WStyle_NoBorder | WX11BypassWM)); _frame[i]->setPaletteBackgroundColor(_color); } } @@ -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..0e9533e08 100644 --- a/kicker/kicker/core/userrectsel.h +++ b/kicker/kicker/core/userrectsel.h @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class ShutUpCompiler; -class UserRectSel : public QWidget +class UserRectSel : public TQWidget { Q_OBJECT @@ -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.cpp b/kicker/kicker/interfaces/kickoff-search-plugin.cpp index c229c85b0..dc887d5e8 100644 --- a/kicker/kicker/interfaces/kickoff-search-plugin.cpp +++ b/kicker/kicker/interfaces/kickoff-search-plugin.cpp @@ -31,7 +31,7 @@ KickoffSearch::Plugin::~Plugin() KickoffSearch::KickoffSearchInterface* KickoffSearch::Plugin::kickoffSearchInterface() { - return static_cast<KickoffSearchInterface*>( parent()->child( 0, "KickoffSearch::KickoffSearchInterface" ) ); + return static_cast<KickoffSearchInterface*>( tqparent()->child( 0, "KickoffSearch::KickoffSearchInterface" ) ); } #include "kickoff-search-plugin.moc" 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..a506bcd5d 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 (); @@ -375,15 +375,15 @@ HitMenuItem *KickoffBeaglePlugin::hitToHitMenuItem (int category, Hit *hit) TQString command = desktopfile.readEntry("Exec"); if (command==input) score = 100; - else if (command.find(input)==0) + else if (command.tqfind(input)==0) score = 50; - else if (command.find(input)!=-1) + else if (command.tqfind(input)!=-1) score = 10; else if (title==input) score = 100; - else if (title.find(input)==0) + else if (title.tqfind(input)==0) score = 50; - else if (title.find(input)!=-1) + else if (title.tqfind(input)!=-1) score = 10; break; } diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp index 796920ed4..47a2c5835 100644 --- a/kicker/kicker/ui/addapplet.cpp +++ b/kicker/kicker/ui/addapplet.cpp @@ -61,7 +61,7 @@ AppletWidget::AppletWidget(const AppletInfo& info, bool odd, TQWidget *parent) m_odd(odd), m_selected(false) { - setFocusPolicy(TQWidget::StrongFocus); + setFocusPolicy(TQ_StrongFocus); setSelected(m_selected); itemTitle->setText("<h3>" + info.name() + "</h3>"); @@ -84,8 +84,8 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e) { if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* me = static_cast<TQMouseEvent*>(e); - if (me->button() & LeftButton) + TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + if (me->button() & Qt::LeftButton) { m_dragStart = me->pos(); } @@ -97,7 +97,7 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e) if (e->type() == TQEvent::MouseMove) { - TQMouseEvent* me = static_cast<TQMouseEvent*>(e); + TQMouseEvent* me = TQT_TQMOUSEEVENT(e); if ((me->pos() - m_dragStart).manhattanLength() > KGlobalSettings::dndEventDelay()) { @@ -130,7 +130,7 @@ void AppletWidget::keyPressEvent(TQKeyEvent *e) } else if (e->key() == Qt::Key_Up) { - TQKeyEvent fakedKeyPress(TQEvent::KeyPress, Qt::Key_BackTab, 0, 0); + TQKeyEvent fakedKeyPress(TQEvent::KeyPress, TQt::Key_BackTab, 0, 0); TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_BackTab, 0, 0); TQApplication::sendEvent(this, &fakedKeyPress); TQApplication::sendEvent(this, &fakedKeyRelease); @@ -150,7 +150,7 @@ void AppletWidget::keyPressEvent(TQKeyEvent *e) void AppletWidget::mousePressEvent(TQMouseEvent *e) { - if (e->button() == TQMouseEvent::LeftButton) + if (e->button() == Qt::LeftButton) { emit clicked(this); m_dragStart = e->pos(); @@ -162,7 +162,7 @@ void AppletWidget::mousePressEvent(TQMouseEvent *e) void AppletWidget::mouseMoveEvent(TQMouseEvent *e) { - if (e->button() == TQMouseEvent::LeftButton && + if (e->button() == Qt::LeftButton && !m_dragStart.isNull() && (e->pos() - m_dragStart).manhattanLength() > KGlobalSettings::dndEventDelay()) @@ -186,7 +186,7 @@ void AppletWidget::mouseReleaseEvent(TQMouseEvent *e) void AppletWidget::mouseDoubleClickEvent(TQMouseEvent *e) { - if (!e->button() == TQMouseEvent::LeftButton) + if (!e->button() == Qt::LeftButton) { AppletItem::mouseDoubleClickEvent(e); return; @@ -291,7 +291,7 @@ void AddAppletDialog::resizeAppletView() { m_appletBox->layout()->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; @@ -305,7 +305,7 @@ bool AddAppletDialog::eventFilter(TQObject *o, TQEvent *e) if (e->type() == TQEvent::Resize) TQTimer::singleShot(0, this, TQT_SLOT(resizeAppletView())); - return TQObject::eventFilter(o, e); + return TQT_TQOBJECT(this)->TQObject::eventFilter(o, e); } void AddAppletDialog::populateApplets() @@ -435,7 +435,7 @@ void AddAppletDialog::addApplet(AppletWidget* applet) // reset the odd/even colouring from this item on down in the list bool odd = applet->odd(); - AppletWidget::List::const_iterator it = m_appletWidgetList.find(applet); + AppletWidget::List::const_iterator it = m_appletWidgetList.tqfind(applet); for (; it != m_appletWidgetList.constEnd(); ++it) { if ((*it)->isHidden()) @@ -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/addapplet_mnu.h b/kicker/kicker/ui/addapplet_mnu.h index caedb4fdb..79c539687 100644 --- a/kicker/kicker/ui/addapplet_mnu.h +++ b/kicker/kicker/ui/addapplet_mnu.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class ContainerArea; -class PanelAddAppletMenu : public QPopupMenu +class PanelAddAppletMenu : public TQPopupMenu { Q_OBJECT diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp index acd82a066..7f4f90676 100644 --- a/kicker/kicker/ui/addappletvisualfeedback.cpp +++ b/kicker/kicker/ui/addappletvisualfeedback.cpp @@ -54,7 +54,7 @@ AddAppletVisualFeedback::AddAppletVisualFeedback(AppletWidget* widget, m_moveTimer(0, "m_moveTimer"), m_dirty(false) { - setFocusPolicy(NoFocus); + setFocusPolicy(TQ_NoFocus); setBackgroundMode(NoBackground); connect(&m_moveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(swoopCloser())); @@ -157,7 +157,7 @@ void AddAppletVisualFeedback::displayInternal() // 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); } } @@ -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..dc660bff1 100644 --- a/kicker/kicker/ui/addappletvisualfeedback.h +++ b/kicker/kicker/ui/addappletvisualfeedback.h @@ -38,7 +38,7 @@ class TQPaintEvent; class TQSimpleRichText; class TQTimer; -class AddAppletVisualFeedback : QWidget +class AddAppletVisualFeedback : TQWidget { Q_OBJECT 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/addextension_mnu.h b/kicker/kicker/ui/addextension_mnu.h index a91986e19..76163250f 100644 --- a/kicker/kicker/ui/addextension_mnu.h +++ b/kicker/kicker/ui/addextension_mnu.h @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "appletinfo.h" -class PanelAddExtensionMenu : public QPopupMenu +class PanelAddExtensionMenu : public TQPopupMenu { Q_OBJECT diff --git a/kicker/kicker/ui/appletitem.ui b/kicker/kicker/ui/appletitem.ui index d9cc2d9b0..dc6faab50 100644 --- a/kicker/kicker/ui/appletitem.ui +++ b/kicker/kicker/ui/appletitem.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>AppletItem</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AppletItem</cstring> </property> @@ -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> @@ -39,7 +39,7 @@ <property name="margin"> <number>2</number> </property> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>layout11</cstring> </property> @@ -47,7 +47,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>itemTitle</cstring> </property> @@ -65,11 +65,11 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>itemDescription</cstring> </property> @@ -87,13 +87,13 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>layout4</cstring> </property> @@ -101,11 +101,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <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> diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp index e0e162d33..2bd8f7bd0 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(); @@ -52,13 +52,13 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP TQString text = isButton ? (isMenu ? i18n("&Move %1 Menu") : i18n("&Move %1 Button")) : i18n("&Move %1"); - insertItem(SmallIcon("move"), text.arg(titleText), Move); + insertItem(SmallIcon("move"), text.tqarg(titleText), Move); // we look for a container area to see if we can add containers // this is part of the kiosk support in kicker, allowing // one to block users from adding new containers ContainerArea* area = 0; - TQObject* findTheArea = parent ? parent->parent() : 0; + TQObject* findTheArea = parent ? parent->tqparent() : 0; while (findTheArea) { area = dynamic_cast<ContainerArea*>(findTheArea); @@ -68,7 +68,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP break; } - findTheArea = findTheArea->parent(); + findTheArea = findTheArea->tqparent(); } if (!area || area->canAddContainers()) @@ -76,7 +76,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP text = isButton ? (isMenu ? i18n("&Remove %1 Menu") : i18n("&Remove %1 Button")) : i18n("&Remove %1"); - insertItem(SmallIcon("remove"), text.arg(titleText), Remove); + insertItem(SmallIcon("remove"), text.tqarg(titleText), Remove); needSeparator = true; } } @@ -103,7 +103,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP KIcon::Small, 0, KIcon::DefaultState, 0, true)); - insertItem(iconPix, i18n("&About %1").arg( titleText ), About); + insertItem(iconPix, i18n("&About %1").tqarg( titleText ), About); needSeparator = !(actions & KPanelApplet::Help); } @@ -123,12 +123,12 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP if (isButton) { insertItem(SmallIcon("configure"), - i18n("&Configure %1 Button...").arg(titleText), Preferences); + i18n("&Configure %1 Button...").tqarg(titleText), Preferences); } else { insertItem(SmallIcon("configure"), - i18n("&Configure %1...").arg(titleText), Preferences); + i18n("&Configure %1...").tqarg(titleText), Preferences); } needSeparator = true; } diff --git a/kicker/kicker/ui/appletop_mnu.h b/kicker/kicker/ui/appletop_mnu.h index 4b396a83d..35e10be3c 100644 --- a/kicker/kicker/ui/appletop_mnu.h +++ b/kicker/kicker/ui/appletop_mnu.h @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class AppletInfo; // The button operations menu (usually right click) -class PanelAppletOpMenu : public QPopupMenu +class PanelAppletOpMenu : public TQPopupMenu { Q_OBJECT diff --git a/kicker/kicker/ui/appletview.ui b/kicker/kicker/ui/appletview.ui index a2fa1e91b..4ba0f38e8 100644 --- a/kicker/kicker/ui/appletview.ui +++ b/kicker/kicker/ui/appletview.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>AppletView</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AppletView</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout8</cstring> </property> @@ -27,7 +27,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -38,7 +38,7 @@ <cstring>appletSearch</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>appletSearch</cstring> </property> @@ -54,7 +54,7 @@ <string><qt>Type here some text to filter on the applet names and comments</qt></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -65,7 +65,7 @@ <cstring>appletFilter</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>All</string> @@ -98,7 +98,7 @@ </widget> </hbox> </widget> - <widget class="QScrollView"> + <widget class="TQScrollView"> <property name="name"> <cstring>appletScrollView</cstring> </property> @@ -110,7 +110,7 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -123,7 +123,7 @@ <string><qt>This is the applet list. Select an applet and click on <b>Add to panel</b> to add it</qt></string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout3</cstring> </property> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>284</width> <height>20</height> @@ -171,7 +171,7 @@ <customwidgets> <customwidget> <class>QScrollView</class> - <header location="global">qscrollview.h</header> + <header location="global">tqscrollview.h</header> <sizehint> <width>-1</width> <height>-1</height> @@ -197,7 +197,7 @@ </tabstops> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>qscrollview.h</includehint> + <includehint>tqscrollview.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp index 2250475b4..46f79db2b 100644 --- a/kicker/kicker/ui/browser_mnu.cpp +++ b/kicker/kicker/ui/browser_mnu.cpp @@ -129,7 +129,7 @@ void PanelBrowserMenu::initialize() } // get entry list - const QFileInfoList *list = dir.entryInfoList(); + const TQFileInfoList *list = dir.entryInfoList(); // no list -> read error if (!list) { @@ -163,7 +163,7 @@ void PanelBrowserMenu::initialize() int run_id = _startid; // get list iterator - QFileInfoListIterator it(*list); + TQFileInfoListIterator it(*list); // jump to startid it += _startid; @@ -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); @@ -380,7 +380,7 @@ void PanelBrowserMenu::mouseMoveEvent(TQMouseEvent *e) { TQPopupMenu::mouseMoveEvent(e); - if (!(e->state() & LeftButton)) return; + if (!(e->state() & Qt::LeftButton)) return; if(_lastpress == TQPoint(-1, -1)) return; // DND delay @@ -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 ) { diff --git a/kicker/kicker/ui/clicklineedit.cpp b/kicker/kicker/ui/clicklineedit.cpp index 52cb8776d..debe91d3e 100644 --- a/kicker/kicker/ui/clicklineedit.cpp +++ b/kicker/kicker/ui/clicklineedit.cpp @@ -22,7 +22,7 @@ #include "clicklineedit.h" -#include "qpainter.h" +#include "tqpainter.h" using namespace KPIM; @@ -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/client_mnu.cpp b/kicker/kicker/ui/client_mnu.cpp index 9736351e1..deaae70b9 100644 --- a/kicker/kicker/ui/client_mnu.cpp +++ b/kicker/kicker/ui/client_mnu.cpp @@ -59,7 +59,7 @@ void KickerClientMenu::insertItem( TQString text, int id ) TQCString KickerClientMenu::insertMenu( TQPixmap icon, TQString text, int id ) { TQString subname("%1-submenu%2"); - TQCString subid = subname.arg(objId()).arg(id).local8Bit(); + TQCString subid = subname.tqarg(static_cast<const char *>(objId())).tqarg(id).local8Bit(); KickerClientMenu *sub = new KickerClientMenu(this, subid); int globalid = TQPopupMenu::insertItem( icon, text, sub, id); setItemParameter( globalid, id ); diff --git a/kicker/kicker/ui/dirdrop_mnu.h b/kicker/kicker/ui/dirdrop_mnu.h index d05187400..ffa157c85 100644 --- a/kicker/kicker/ui/dirdrop_mnu.h +++ b/kicker/kicker/ui/dirdrop_mnu.h @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqpopupmenu.h> // The directory dropped menu -class PanelDirDropMenu : public QPopupMenu +class PanelDirDropMenu : public TQPopupMenu { public: enum OpButton{Url=1, Browser}; diff --git a/kicker/kicker/ui/exe_dlg.cpp b/kicker/kicker/ui/exe_dlg.cpp index cb0d42c56..0829f6ccb 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() @@ -135,11 +135,11 @@ void PanelExeDialog::fillCompletion() TQDir d( (*it) ); d.setFilter( TQDir::Files | TQDir::Executable ); - const QFileInfoList *list = d.entryInfoList(); + const TQFileInfoList *list = d.entryInfoList(); if (!list) continue; - QFileInfoListIterator it2( *list ); + TQFileInfoListIterator it2( *list ); TQFileInfo *fi; while ( (fi = it2.current()) != 0 ) { @@ -164,7 +164,7 @@ void PanelExeDialog::slotTextChanged(const TQString &str) } TQString exeLocation = str; - TQMap<TQString, TQString>::iterator it = m_partialPath2full.find(str); + TQMap<TQString, TQString>::iterator it = m_partialPath2full.tqfind(str); if (it != m_partialPath2full.end()) exeLocation = it.data(); @@ -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/extensionop_mnu.cpp b/kicker/kicker/ui/extensionop_mnu.cpp index a30434a48..582c44b46 100644 --- a/kicker/kicker/ui/extensionop_mnu.cpp +++ b/kicker/kicker/ui/extensionop_mnu.cpp @@ -59,7 +59,7 @@ PanelExtensionOpMenu::PanelExtensionOpMenu(const TQString& extension, int action if (!Kicker::the()->isImmutable() && (actions & KPanelExtension::Preferences)) { insertSeparator(); - insertItem(SmallIcon("configure"), i18n("&Configure %1...").arg(extension), Preferences); + insertItem(SmallIcon("configure"), i18n("&Configure %1...").tqarg(extension), Preferences); } adjustSize(); diff --git a/kicker/kicker/ui/extensionop_mnu.h b/kicker/kicker/ui/extensionop_mnu.h index 01bda4340..a1fa63cd6 100644 --- a/kicker/kicker/ui/extensionop_mnu.h +++ b/kicker/kicker/ui/extensionop_mnu.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqpopupmenu.h> -class PanelExtensionOpMenu : public QPopupMenu +class PanelExtensionOpMenu : public TQPopupMenu { public: enum OpButton{Move = 9900, Remove = 9901, Help = 9902, About = 9903, Preferences = 9904, ReportBug = 9905, Shade = 9906 }; 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..58bde0457 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); } @@ -138,7 +138,7 @@ void HideButton::generateIcons() } TQImage image = pixmap()->convertToImage(); - image = image.smoothScale(size() - TQSize(4, 4), TQImage::ScaleMin); + image = image.smoothScale(size() - TQSize(4, 4), TQ_ScaleMin); KIconEffect effect; @@ -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/hidebutton.h b/kicker/kicker/ui/hidebutton.h index 9a6c4612e..bb68929a1 100644 --- a/kicker/kicker/ui/hidebutton.h +++ b/kicker/kicker/ui/hidebutton.h @@ -23,7 +23,7 @@ #include <tqbutton.h> #include <tqpixmap.h> -class HideButton : public QButton +class HideButton : public TQButton { Q_OBJECT diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp index dcb4760c1..d7df05170 100644 --- a/kicker/kicker/ui/itemview.cpp +++ b/kicker/kicker/ui/itemview.cpp @@ -99,16 +99,16 @@ 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() { setMultiLinesEnabled(true); m_s = 0; - m_path = TQString::null; - m_icon = TQString::null; - m_menuPath = TQString::null; + m_path = TQString(); + m_icon = TQString(); + m_menuPath = TQString(); setDragEnabled(true); m_has_children = false; m_old_width = -1; @@ -145,28 +145,28 @@ void KMenuItem::setIcon(const TQString& icon, int size) void KMenuItem::setHasChildren( bool flag ) { m_has_children = flag; - repaint(); + tqrepaint(); } void KMenuItem::setup() { // if someone configured a larger generalFont than 10pt, he might have a _real_ problem with 7pt // the 7pt could be read out of konquerorrc I guess - float min_font_size = 7. * QMAX(1., KGlobalSettings::generalFont().pointSizeFloat() / 10.); + float min_font_size = 7. * TQMAX(1., KGlobalSettings::generalFont().pointSizeFloat() / 10.); const int expected_height = 38; - description_font_size = QMAX( pointSize( expected_height * .3, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size ) ; - title_font_size = QMAX( pointSize( expected_height * .25, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ); + description_font_size = TQMAX( pointSize( expected_height * .3, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size ) ; + title_font_size = TQMAX( pointSize( expected_height * .25, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ); //kdDebug() << description_font_size << " " << title_font_size << " " << pointSize( expected_height * .25, listView() ) << endl; TQListViewItem::setup(); - setHeight( (int)QMAX( expected_height, pixelSize( title_font_size + description_font_size * 2.3, listView()))); + setHeight( (int)TQMAX( expected_height, pixelSize( title_font_size + description_font_size * 2.3, TQT_TQPAINTDEVICE(listView())))); } 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(); } } } @@ -275,7 +275,7 @@ void KMenuItem::paintCellInter(TQPainter* p, const TQColorGroup & cg, int column if ( m_description.isEmpty() ) spacing = ( height() - f1h ) / 2; - int right_triangle_size = pixelSize( 7, listView() ); + int right_triangle_size = pixelSize( 7, TQT_TQPAINTDEVICE(listView()) ); int right_margin = listView()->verticalScrollBar()->width(); if ( m_has_children ) @@ -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(); } } @@ -371,9 +371,9 @@ void KMenuItemSeparator::setup() TQFontMetrics fm(f); f.setPointSize( 8 + KickerSettings::kickoffFontPointSizeOffset() ); if ( itemAbove() && !text( 0 ).isEmpty() ) - setHeight( (int)QMAX( 34., fm.height() * 1.4) ); + setHeight( (int)TQMAX( 34., fm.height() * 1.4) ); else - setHeight( (int)QMAX( 26., fm.height() * 1.4 ) ); + setHeight( (int)TQMAX( 26., fm.height() * 1.4 ) ); } void KMenuItemSeparator::setLink( const TQString &text, const TQString &url ) @@ -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)); @@ -501,7 +501,7 @@ void KMenuItemHeader::setup() KMenuItem::setup(); TQFontMetrics fm( listView()->font() ); - setHeight( QMAX( int( texts.count() * fm.height() + ( texts.count() + 1 ) * 2 + 10 ), height()) ); + setHeight( TQMAX( int( texts.count() * fm.height() + ( texts.count() + 1 ) * 2 + 10 ), height()) ); // nada } @@ -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( TQMAX( pointSize( 12, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ), TQT_TQPAINTDEVICE(listView()) ) ); TQFont f1 = p->font(); f1.setPixelSize( title_font_pixelSize ); @@ -538,7 +538,7 @@ void KMenuItemHeader::paintCell(TQPainter* p, const TQColorGroup & cg, int , int p->setPen( cg.color( TQColorGroup::Text ) ); const int text_margin = 2; - int spacing = ( height() - texts.count() * f1h - QMAX( texts.count() - 1, 0 ) * text_margin ) / 2; + int spacing = ( height() - texts.count() * f1h - TQMAX( texts.count() - 1, 0 ) * text_margin ) / 2; for ( uint i = 0; i < texts.count(); ++i ) { @@ -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 ) ); @@ -632,7 +632,7 @@ ItemView::ItemView(TQWidget* parent, const char* name) setItemMargin(0); setSorting(-1); setTreeStepSize(38); - setFocusPolicy(TQWidget::NoFocus); + setFocusPolicy(TQ_NoFocus); m_lastOne = 0; m_old_contentY = -1; @@ -715,7 +715,7 @@ KMenuItem* ItemView::insertItem( const TQString& icon, const TQString& text, con KMenuItem* ItemView::insertItem( const TQString& icon, const TQString& text, const TQString& description, int nId, int nIndex, KMenuItem *parent) { - return insertItem( icon, text, description, TQString::null, nId, nIndex, parent); + return insertItem( icon, text, description, TQString(), nId, nIndex, parent); } int ItemView::setItemEnabled(int id, bool enabled) @@ -761,8 +761,8 @@ void ItemView::slotMoveContent() int item_height = 0; TQListViewItemIterator it( this ); while ( it.current() ) { - if ( !dynamic_cast<KMenuSpacer*>( it.current() ) && !it.current()->parent() && it.current()->isVisible() ) { - it.current()->invalidateHeight(); + if ( !dynamic_cast<KMenuSpacer*>( it.current() ) && !it.current()->tqparent() && it.current()->isVisible() ) { + 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(); @@ -941,7 +941,7 @@ void ItemView::contentsMouseMoveEvent(TQMouseEvent *e) if (m_mouseMoveSelects) { if(i && i->isEnabled() && !i->isSelected() && // FIXME: This is wrong if you drag over the items. - (e->state() & (LeftButton|MidButton|RightButton)) == 0) + (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0) KListView::setSelected(i, true); else if (!i && selectedItem()) KListView::setSelected(selectedItem(), false); @@ -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(); } } @@ -984,7 +984,7 @@ void ItemView::clear() KListView::clear(); m_lastOne = 0; m_old_contentY = -1; - m_back_url = TQString::null; + m_back_url = TQString(); } void ItemView::contentsWheelEvent(TQWheelEvent *e) @@ -996,7 +996,7 @@ void ItemView::contentsWheelEvent(TQWheelEvent *e) if(i && i->isEnabled() && !i->isSelected() && // FIXME: This is wrong if you drag over the items. - (e->state() & (LeftButton|MidButton|RightButton)) == 0) + (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0) KListView::setSelected(i, true); else if (!i && selectedItem()) KListView::setSelected(selectedItem(), false); @@ -1022,14 +1022,14 @@ TQDragObject * ItemView::dragObject() TQBitmap mask; - if (pix.mask()) - mask = *pix.mask(); + if (pix.tqmask()) + mask = *pix.tqmask(); else { mask.resize(pix.size()); mask.fill(Qt::color1); } - bitBlt( &mask, pix.width()-add.width(), pix.height()-add.height(), add.mask(), 0, 0, add.width(), add.height(), OrROP ); + bitBlt( &mask, pix.width()-add.width(), pix.height()-add.height(), add.tqmask(), 0, 0, add.width(), add.height(), OrROP ); pix.setMask( mask ); o->setPixmap(pix); @@ -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(); } @@ -1070,7 +1070,7 @@ int ItemView::goodHeight() int item_height = 0; TQListViewItemIterator it( this ); while ( it.current() ) { - if ( !dynamic_cast<KMenuSpacer*>( it.current() ) && !it.current()->parent() && it.current()->isVisible() ) { + if ( !dynamic_cast<KMenuSpacer*>( it.current() ) && !it.current()->tqparent() && it.current()->isVisible() ) { item_height += it.current()->height(); } ++it; @@ -1087,7 +1087,7 @@ KMenuItemDrag::KMenuItemDrag(KMenuItem& item, TQWidget *dragSource) buff.open(IO_WriteOnly); TQDataStream s(&buff); - s << item.id() << (item.service() ? item.service()->storageId() : TQString::null) + s << item.id() << (item.service() ? item.service()->storageId() : TQString()) << item.title() << item.description() << item.icon() << item.path(); } @@ -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; @@ -1162,7 +1162,7 @@ bool KMenuItemDrag::decode(const TQMimeSource* e, KMenuItemInfo& item) item.m_title = item.m_path; item.m_icon = KMimeType::iconForURL( url ); item.m_title = item.m_path.section( '/', -1, -1 ); - int last_slash = url.findRev ('/', -1); + int last_slash = url.tqfindRev ('/', -1); if (last_slash == 0) item.m_description = i18n("Directory: /)"); else @@ -1205,13 +1205,13 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const TQStringList favs = KickerSettings::favorites(); if (item.m_s) - return favs.find(item.m_s->storageId())==favs.end(); + return favs.tqfind(item.m_s->storageId())==favs.end(); else { TQStringList::Iterator it; 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())==uri) break; } } @@ -1233,15 +1233,15 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const TQStringList favs = KickerSettings::favorites(); if (text.endsWith(".desktop")) { - KService::Ptr p = KService::serviceByDesktopPath(text.replace("file://",TQString::null)); - return (p && favs.find(p->storageId())==favs.end()); + KService::Ptr p = KService::serviceByDesktopPath(text.tqreplace("file://",TQString())); + return (p && favs.tqfind(p->storageId())==favs.end()); } else { TQStringList::Iterator it; 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())==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..d2952d93a 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() ); } } @@ -261,7 +261,7 @@ void PanelKMenu::initialize() TQHBox* hbox = new TQHBox( this ); KToolBarButton *clearButton = new KToolBarButton( "locationbar_erase", 0, hbox ); searchEdit = new KPIM::ClickLineEdit(hbox, " "+i18n("Press '/' to search...")); - hbox->setFocusPolicy(TQWidget::StrongFocus); + hbox->setFocusPolicy(TQ_StrongFocus); hbox->setFocusProxy(searchEdit); hbox->setSpacing( 3 ); connect(clearButton, TQT_SIGNAL(clicked()), searchEdit, TQT_SLOT(clear())); @@ -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 - 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 + // This forces a layout/tqrepaint of the qpopupmenu + tqrepaint(); // This ensures that the side bar image was applied + styleChange(tqstyle()); // This forces a call to the private function updateSize(TRUE) inside the qpopupmenu. + update(); // This tqrepaints the entire popup menu to apply the widget size/tqalignment changes made above } } @@ -444,7 +444,7 @@ void PanelKMenu::slotLock() TQCString appname( "kdesktop" ); if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); - kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", ""); + kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString("")); } void PanelKMenu::slotLogout() @@ -493,7 +493,7 @@ void PanelKMenu::slotSessionActivated( int ent ) void PanelKMenu::doNewSession( bool lock ) { int result = KMessageBox::warningContinueCancel( - kapp->desktop()->screen(kapp->desktop()->screenNumber(this)), + TQT_TQWIDGET(kapp->desktop()->screen(kapp->desktop()->screenNumber(this))), i18n("<p>You have chosen to open another desktop session.<br>" "The current session will be hidden " "and a new login screen will be displayed.<br>" @@ -579,7 +579,7 @@ 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 ); } @@ -590,21 +590,21 @@ void PanelKMenu::resizeEvent(TQResizeEvent * e) 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; } @@ -619,9 +619,9 @@ void PanelKMenu::paintEvent(TQPaintEvent * e) TQPainter p(this); p.setClipRegion(e->region()); - style().drawPrimitive( TQStyle::PE_PanelPopup, &p, + tqstyle().tqdrawPrimitive( 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() ); 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..3fa259189 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; @@ -168,7 +168,7 @@ static int used_size( TQLabel *label, int oldsize ) KMenu::KMenu() : KMenuBase(0, "SUSE::Kickoff::KMenu") , m_sloppyTimer(0, "KNewMenu::sloppyTimer"), m_mediaFreeTimer(0, "KNewMenu::mediaFreeTimer"), - m_iconName(TQString::null), m_orientation(UnDetermined), m_search_plugin( 0 ) + m_iconName(TQString()), m_orientation(UnDetermined), m_search_plugin( 0 ) { setMouseTracking(true); connect(&m_sloppyTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotSloppyTimeout())); @@ -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 ); @@ -296,13 +296,13 @@ KMenu::KMenu() m_searchResultsWidget->setItemMargin(4); m_searchResultsWidget->setIconSize(16); m_searchActions = new ItemView (m_searchWidget, "m_searchActions"); - m_searchActions->setFocusPolicy(TQWidget::NoFocus); + m_searchActions->setFocusPolicy(TQ_NoFocus); m_searchActions->setItemMargin(4); m_searchInternet = new TQListViewItem(m_searchActions, i18n("Search Internet")); 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,11 +421,11 @@ 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->setFocusPolicy( TQ_StrongFocus ); m_stacker->setLineWidth( 0 ); - m_stacker->setFocusPolicy(TQWidget::NoFocus); + m_stacker->setFocusPolicy(TQ_NoFocus); connect(m_stacker, TQT_SIGNAL(aboutToShow(TQWidget*)), TQT_SLOT(stackWidgetRaised(TQWidget*))); m_kcommand->setName("m_kcommand"); @@ -453,16 +453,16 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) TQPoint p; if (e->type() == TQEvent::MouseMove || e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* me = static_cast<TQMouseEvent*>(e); + TQMouseEvent* me = TQT_TQMOUSEEVENT(e); p = me->globalPos(); } else if (e->type() == TQEvent::Wheel) { - TQWheelEvent* we = static_cast<TQWheelEvent*>(e); + TQWheelEvent* we = TQT_TQWHEELEVENT(e); p = we->globalPos(); } while (receiver) { - if (receiver == m_tabBar && (e->type()!=TQEvent::MouseMove || KickerSettings::kickoffSwitchTabsOnHover() ) ) { + if (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_tabBar) && (e->type()!=TQEvent::MouseMove || KickerSettings::kickoffSwitchTabsOnHover() ) ) { TQTab* s = m_tabBar->selectTab(m_tabBar->mapFromGlobal(p)); if (s && s->identifier() == ApplicationsTab) raiseWidget = m_browserView; @@ -482,8 +482,8 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) /* we do not want hover activation for the search line edit as this can be * pretty disturbing */ - if ( (receiver == m_searchPixmap || - ( ( receiver == m_searchLabel || receiver==m_kcommand->lineEdit() ) && + if ( (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_searchPixmap) || + ( ( TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_searchLabel) || TQT_BASE_OBJECT(receiver)==TQT_BASE_OBJECT(m_kcommand->lineEdit()) ) && ( e->type() == TQEvent::KeyPress || e->type() == TQEvent::Wheel || e->type() == TQEvent::MouseButtonPress ) ) ) && !m_isShowing) { @@ -495,34 +495,34 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) if(raiseWidget) break; if(receiver->isWidgetType()) - receiver = static_cast<TQWidget*>(receiver)->parentWidget(true); + receiver = TQT_TQOBJECT(TQT_TQWIDGET(receiver)->tqparentWidget(true)); else break; } if (e->type() == TQEvent::FocusIn && receiver && raiseWidget) { - m_searchResultsWidget->setFocusPolicy(TQWidget::StrongFocus); + m_searchResultsWidget->setFocusPolicy(TQ_StrongFocus); m_searchActions->setFocusPolicy(raiseWidget == m_searchWidget ? - TQWidget::StrongFocus : TQWidget::NoFocus); + TQ_StrongFocus : TQ_NoFocus); setTabOrder(raiseWidget, m_searchResultsWidget); if (raiseWidget != m_stacker->visibleWidget() - && static_cast<TQWidget*>(receiver)->focusPolicy() == TQWidget::NoFocus + && TQT_TQWIDGET(receiver)->focusPolicy() == TQ_NoFocus && m_stacker->id(raiseWidget) >= 0) { m_stacker->raiseWidget(raiseWidget); return true; } - if (raiseWidget->focusPolicy() != TQWidget::NoFocus) + if (raiseWidget->focusPolicy() != TQ_NoFocus) 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= tqstyle().tqstyleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay); if (m_sloppySourceClicked) timeout = 3000; m_sloppyTimer.start(timeout); @@ -535,7 +535,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) } if(e->type() == TQEvent::Enter && receiver->isWidgetType()) { - static_cast<TQWidget*>(receiver)->setMouseTracking(true); + TQT_TQWIDGET(receiver)->setMouseTracking(true); TQToolTip::hide(); } @@ -562,7 +562,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) if (view) { bool handled = true; - switch (static_cast<TQKeyEvent*>(e)->key()) { + switch (TQT_TQKEYEVENT(e)->key()) { case Key_Up: if (view->selectedItem()) { view->setSelected(view->selectedItem()->itemAbove(),true); @@ -639,7 +639,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) r = true; } - if (e->type() == TQEvent::Enter && receiver == m_stacker) + if (e->type() == TQEvent::Enter && TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_stacker)) { TQRect r(m_stacker->mapToGlobal(TQPoint(-8,-32)), m_stacker->size()); r.setSize(r.size()+TQSize(16,128)); @@ -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); @@ -753,12 +753,12 @@ void KMenu::stackWidgetRaised(TQWidget* raiseWidget) if (raiseWidget == m_browserView) { if ( m_tabBar->currentTab() == ApplicationsTab) - slotGoSubMenu(TQString::null); + slotGoSubMenu(TQString()); if (m_browserDirty ) { createNewProgramList(); m_browserView->prepareRightMove(); m_browserView->currentView()->clear(); - fillSubMenu(TQString::null, m_browserView->currentView()); + fillSubMenu(TQString(), m_browserView->currentView()); m_browserDirty = false; } } @@ -828,7 +828,7 @@ void KMenu::paletteChanged() void KMenu::tabClicked(TQTab* t) { if (t==m_tabs[ApplicationsTab]) - slotGoSubMenu(TQString::null); + slotGoSubMenu(TQString()); else if (t==m_tabs[LeaveTab]) slotGoExitMainMenu(); } @@ -843,7 +843,7 @@ void KMenu::slotGoExitMainMenu() if (m_exitView->currentView()==m_exitView->rightView()) { m_exitView->prepareLeftMove(false); m_exitView->showBackButton(false); - m_exitView->flipScroll(TQString::null); + m_exitView->flipScroll(TQString()); } } @@ -882,13 +882,13 @@ 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; if (DM().localSessions( sess )) { if (sess.count()>1) - m_exitView->rightView()->insertSeparator( nId++, TQString::null, index++ ); + m_exitView->rightView()->insertSeparator( nId++, TQString(), index++ ); for (SessList::ConstIterator it = sess.begin(); it != sess.end(); ++it) { if ((*it).vt && !(*it).self) { TQString user, loc; @@ -902,7 +902,7 @@ void KMenu::slotGoExitSubMenu(const TQString& url) m_exitView->rightView()->insertHeader( nId++, "kicker:/switchuser/" ); } - m_exitView->flipScroll(TQString::null); + m_exitView->flipScroll(TQString()); } void KMenu::slotGoSubMenu(const TQString& relPath) @@ -918,16 +918,16 @@ void KMenu::goSubMenu(const TQString& relPath, bool keyboard) int index = rel.length() - 1; if ( rel.endsWith( "/" ) ) index--; - index = rel.findRev( '/', index ); + index = rel.tqfindRev( '/', index ); kdDebug() << "goup, rel '" << rel << "' " << index << endl; TQString currel = rel; rel = rel.left( index + 1 ); if ( rel == "/" ) - rel = TQString::null; + rel = TQString(); kdDebug() << "goup, rel '" << rel << "' " << rel.isEmpty() << endl; fillSubMenu( rel, m_browserView->prepareLeftMove() ); - m_browserView->flipScroll(keyboard ? currel : TQString::null); + m_browserView->flipScroll(keyboard ? currel : TQString()); return; } else if (relPath.isEmpty()) { @@ -952,7 +952,7 @@ void KMenu::goSubMenu(const TQString& relPath, bool keyboard) //m_browserView->clear(); fillSubMenu(relPath, m_browserView->prepareRightMove()); } - m_browserView->flipScroll(keyboard ? "kicker:/goup/": TQString::null); + m_browserView->flipScroll(keyboard ? "kicker:/goup/": TQString()); } void KMenu::fillSubMenu(const TQString& relPath, ItemView *view) @@ -973,9 +973,9 @@ void KMenu::fillSubMenu(const TQString& relPath, ItemView *view) } else if ( m_newInstalledPrograms.count() ) { KMenuItem *item = view->insertItem( "clock", i18n( "New Applications" ), - TQString::null, "kicker:/new/", nId++, -1 ); + TQString(), "kicker:/new/", nId++, -1 ); item->setHasChildren( true ); - view->insertSeparator( nId++, TQString::null, -1 ); + view->insertSeparator( nId++, TQString(), -1 ); } view->path = relPath; @@ -1136,7 +1136,7 @@ void KMenu::fillMenu(KServiceGroup::Ptr& continue; } - KMenuItem *item = view->insertItem(g->icon(), groupCaption, TQString::null, g->relPath(), id++, -1); + KMenuItem *item = view->insertItem(g->icon(), groupCaption, TQString(), g->relPath(), id++, -1); item->setMenuPath(g->relPath()); item->setHasChildren( true ); @@ -1165,11 +1165,11 @@ void KMenu::fillMenu(KServiceGroup::Ptr& KService::Ptr s(static_cast<KService *>(e)); if (_relPath.isEmpty()) { TQStringList favs = KickerSettings::favorites(); - if (favs.find(s->storageId())!=favs.end()) + if (favs.tqfind(s->storageId())!=favs.end()) continue; } #ifdef KDELIBS_SUSE - KMenuItem *item = view->insertMenuItem(s, id++, -1, 0, TQString::null, specialTitle[s->name()], categoryIcon[s->name()] ); + KMenuItem *item = view->insertMenuItem(s, id++, -1, 0, TQString(), specialTitle[s->name()], categoryIcon[s->name()] ); if (shortenedMenuPath[s->name()].isEmpty()) item->setMenuPath(_relPath+s->menuId()); else @@ -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()))) m_favoriteView->insertItem(df.readIcon(),df.readName(),df.readGenericName(), url, nId++, index++); } else { @@ -1268,7 +1268,7 @@ void KMenu::initialize() } } - //nId = m_favoriteView->insertSeparator( nId, TQString::null, index++ ); + //nId = m_favoriteView->insertSeparator( nId, TQString(), index++ ); // m_favoriteView->insertDocument(KURL("help:/khelpcenter/userguide/index.html"), nId++); insertStaticItems(); @@ -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++ ); @@ -1365,7 +1365,7 @@ void KMenu::insertStaticItems() m_systemView->insertItem( "network", i18n( "Network Folders" ), "remote:/", "remote:/", nId++, index++ ); - m_mediaWatcher = new MediaWatcher( this ); + m_mediaWatcher = new MediaWatcher( TQT_TQOBJECT(this) ); connect( m_mediaWatcher, TQT_SIGNAL( mediumChanged() ), TQT_SLOT( updateMedia() ) ); m_media_id = 0; @@ -1399,7 +1399,7 @@ void KMenu::slotLock() TQCString appname( "kdesktop" ); if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); - kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", ""); + kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString("")); } void KMenu::slotOpenHomepage() @@ -1454,7 +1454,7 @@ void KMenu::slotSessionActivated( int ent ) void KMenu::doNewSession( bool lock ) { int result = KMessageBox::warningContinueCancel( - kapp->desktop()->screen(kapp->desktop()->screenNumber(this)), + TQT_TQWIDGET(kapp->desktop()->screen(kapp->desktop()->screenNumber(this))), i18n("<p>You have chosen to open another desktop session.<br>" "The current session will be hidden " "and a new login screen will be displayed.<br>" @@ -1512,7 +1512,7 @@ void KMenu::searchAccept() int kicker_screen_number = qt_xscreen(); if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); - kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", ""); + kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString("")); } } @@ -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: @@ -1672,7 +1672,7 @@ void KMenu::setOrientation(MenuOrientation orientation) m_orientation=orientation; - m_resizeHandle->setCursor(m_orientation == BottomUp ? Qt::sizeBDiagCursor : Qt::sizeFDiagCursor); + m_resizeHandle->setCursor(m_orientation == BottomUp ? tqsizeBDiagCursor : tqsizeFDiagCursor); TQPixmap pix; if ( m_orientation == BottomUp ) @@ -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,7 +1762,7 @@ 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(); @@ -1906,13 +1906,13 @@ bool KMenu::dontQueryNow (const TQString& str) if (str == current_query.get()) return true; int length = str.length (); - int last_whitespace = str.findRev (' ', -1); + int last_whitespace = str.tqfindRev (' ', -1); if (last_whitespace == length-1) return false; // if the user typed a space, search if (last_whitespace >= length-2) return true; // dont search if the user only typed one character TQChar lastchar = str[length-1]; - if (lastchar == ":" || lastchar == "=") + if (lastchar == ':' || lastchar == '=') return true; return false; } @@ -1923,11 +1923,11 @@ void KMenu::createNewProgramList() m_seenPrograms = KickerSettings::firstSeenApps(); m_newInstalledPrograms.clear(); - m_currentDate = TQDate::currentDate().toString(Qt::ISODate); + m_tqcurrentDate = TQDate::currentDate().toString(Qt::ISODate); bool initialize = (m_seenPrograms.count() == 0); - createNewProgramList(TQString::null); + createNewProgramList(TQString()); if (initialize) { for (TQStringList::Iterator it = m_seenPrograms.begin(); it != m_seenPrograms.end(); ++it) @@ -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()); TQStringList::Iterator it_find = m_seenPrograms.begin(); TQStringList::Iterator it_end = m_seenPrograms.end(); bool found = false; @@ -1978,8 +1978,8 @@ void KMenu::createNewProgramList(TQString relPath) if (!found) { m_seenProgramsChanged=true; m_seenPrograms+=shortStorageId; - m_seenPrograms+=m_currentDate; - if (m_newInstalledPrograms.find(s->storageId())==m_newInstalledPrograms.end()) + m_seenPrograms+=m_tqcurrentDate; + if (m_newInstalledPrograms.tqfind(s->storageId())==m_newInstalledPrograms.end()) m_newInstalledPrograms+=s->storageId(); } else { @@ -1987,7 +1987,7 @@ void KMenu::createNewProgramList(TQString relPath) if (*(it_find)!="-") { TQDate date = TQDate::fromString(*(it_find),Qt::ISODate); if (date.daysTo(TQDate::currentDate())<3) { - if (m_newInstalledPrograms.find(s->storageId())==m_newInstalledPrograms.end()) + if (m_newInstalledPrograms.tqfind(s->storageId())==m_newInstalledPrograms.end()) m_newInstalledPrograms+=s->storageId(); } else { @@ -2033,24 +2033,24 @@ void KMenu::searchProgramList(TQString relPath) int score = 0; if (s->exec()==input) score = 100; - else if (s->exec().find(input)==0) + else if (s->exec().tqfind(input)==0) score = 50; - else if (s->exec().find(input)!=-1) + else if (s->exec().tqfind(input)!=-1) score = 10; else if (s->name().lower()==input) score = 100; else if (s->genericName().lower()==input) score = 100; - else if (s->name().lower().find(input)==0) + else if (s->name().lower().tqfind(input)==0) score = 50; - else if (s->genericName().lower().find(input)==0) + else if (s->genericName().lower().tqfind(input)==0) score = 50; - else if (s->name().lower().find(input)!=-1) + else if (s->name().lower().tqfind(input)!=-1) score = 10; - else if (s->genericName().lower().find(input)!=-1) + else if (s->genericName().lower().tqfind(input)!=-1) score = 10; - if (s->exec().find(' ')==-1) + if (s->exec().tqfind(' ')==-1) score+=1; if (s->substituteUid()) @@ -2074,7 +2074,7 @@ void KMenu::searchProgramList(TQString relPath) } HitMenuItem *hit_item = new HitMenuItem (firstLine, secondLine, - s->desktopEntryPath(), TQString::null, 0, APPS, s->icon(), score); + s->desktopEntryPath(), TQString(), 0, APPS, s->icon(), score); if (hit_item == NULL) continue; @@ -2082,7 +2082,7 @@ void KMenu::searchProgramList(TQString relPath) insertSearchResult(hit_item); TQString exe = s->exec(); - int pos = exe.find(' '); + int pos = exe.tqfind(' '); if (pos>0) exe=exe.left(pos); m_programsInMenu+=KGlobal::dirs()->findExe(exe); @@ -2105,7 +2105,7 @@ void KMenu::searchBookmarks(KBookmarkGroup group) } HitMenuItem *hit_item = new HitMenuItem (bookmark.fullText(), bookmark.fullText(), - bookmark.url(), TQString::null, 0, BOOKMARKS, bookmark.icon()); + bookmark.url(), TQString(), 0, BOOKMARKS, bookmark.icon()); insertSearchResult(hit_item); } @@ -2162,7 +2162,7 @@ void KMenu::searchAddressbook() } hit_item = new HitMenuItem (i18n("Send Email to %1").arg(realName), (*it).preferredEmail(), - "mailto:"+(*it).preferredEmail(), TQString::null, 0, ACTIONS, "mail_new"); + "mailto:"+(*it).preferredEmail(), TQString(), 0, ACTIONS, "mail_new"); insertSearchResult(hit_item); } @@ -2173,7 +2173,7 @@ void KMenu::searchAddressbook() } hit_item = new HitMenuItem (i18n("Open Addressbook at %1").arg(realName), (*it).preferredEmail(), - "kaddressbook:/"+(*it).uid(), TQString::null, 0, ACTIONS, "kaddressbook"); + "kaddressbook:/"+(*it).uid(), TQString(), 0, ACTIONS, "kaddressbook"); insertSearchResult(hit_item); @@ -2205,7 +2205,7 @@ TQString KMenu::insertBreaks(const TQString& text, TQFontMetrics fm, int width, void KMenu::clearSearchResults(bool showHelp) { m_searchResultsWidget->clear(); - m_searchResultsWidget->setFocusPolicy(showHelp ? TQWidget::NoFocus : TQWidget::StrongFocus); + m_searchResultsWidget->setFocusPolicy(showHelp ? TQ_NoFocus : TQ_StrongFocus); setTabOrder(m_kcommand, m_searchResultsWidget); if (showHelp) { @@ -2280,8 +2280,8 @@ void KMenu::doQuery (bool return_pressed) if (!result.isEmpty()) { categorised_hit_total[ACTIONS] ++; - HitMenuItem *hit_item = new HitMenuItem (i18n("%1 = %2").arg(query_str, result), TQString::null, - "kcalc", TQString::null, (++max_category_id [ACTIONS]), ACTIONS, "kcalc"); + HitMenuItem *hit_item = new HitMenuItem (i18n("%1 = %2").arg(query_str, result), TQString(), + "kcalc", TQString(), (++max_category_id [ACTIONS]), ACTIONS, "kcalc"); int index = getHitMenuItemPosition (hit_item); m_searchResultsWidget->insertItem(iconForHitMenuItem(hit_item), hit_item->display_name, hit_item->display_info, KGlobal::dirs()->findExe("kcalc"), max_category_id [ACTIONS], index); @@ -2291,15 +2291,15 @@ void KMenu::doQuery (bool return_pressed) // detect email address if (emailRegExp.exactMatch(query_str)) { categorised_hit_total[ACTIONS] ++; - HitMenuItem *hit_item = new HitMenuItem (i18n("Send Email to %1").arg(query_str), TQString::null, - "mailto:"+query_str, TQString::null, (++max_category_id [ACTIONS]), ACTIONS, "mail_new"); + HitMenuItem *hit_item = new HitMenuItem (i18n("Send Email to %1").arg(query_str), TQString(), + "mailto:"+query_str, TQString(), (++max_category_id [ACTIONS]), ACTIONS, "mail_new"); int index = getHitMenuItemPosition (hit_item); m_searchResultsWidget->insertItem(iconForHitMenuItem(hit_item), hit_item->display_name, hit_item->display_info, "mailto:"+query_str, max_category_id [ACTIONS], index); } // quick own application search m_programsInMenu.clear(); - searchProgramList(TQString::null); + searchProgramList(TQString()); KURIFilterData filterData; filterData.setData(query_str); @@ -2329,18 +2329,18 @@ void KMenu::doQuery (bool return_pressed) if (exe.endsWith("/bin/gimp")) { TQStringList::ConstIterator it = m_programsInMenu.begin(); for (; it != m_programsInMenu.end(); ++it) - if ((*it).find("bin/gimp-remote-")!=-1) { + if ((*it).tqfind("bin/gimp-remote-")!=-1) { gimp_hack = true; break; } } #endif - if (m_programsInMenu.find(exe)!=m_programsInMenu.end() + if (m_programsInMenu.tqfind(exe)!=m_programsInMenu.end() #ifdef KDELIBS_SUSE || gimp_hack #endif ) - exe = TQString::null; + exe = TQString(); else if (kapp->authorize("shell_access")) { if( filterData.hasArgsAndOptions() ) @@ -2356,8 +2356,8 @@ void KMenu::doQuery (bool return_pressed) if (!description.isEmpty()) { categorised_hit_total[ACTIONS] ++; - HitMenuItem *hit_item = new HitMenuItem (description, TQString::null, - exe.isEmpty() ? filterData.uri() : exe, TQString::null, + HitMenuItem *hit_item = new HitMenuItem (description, TQString(), + exe.isEmpty() ? filterData.uri() : exe, TQString(), (++max_category_id [ACTIONS]), ACTIONS, exe.isEmpty() ? "fileopen": "run"); int index = getHitMenuItemPosition (hit_item); m_searchResultsWidget->insertItem(iconForHitMenuItem(hit_item), hit_item->display_name, @@ -2521,7 +2521,7 @@ void KMenu::updateCategoryTitles() sep->setText( 0, i18n( "%1 (top %2 of %3)" ).arg( i18n(categories [i].utf8()) ).arg( max ).arg( categorised_hit_total [i] ) ); } else { - sep->setLink( TQString::null ); + sep->setLink( TQString() ); } } delete[] already_added; @@ -2540,15 +2540,15 @@ 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); - TQString mimetype_icon = mimetype_ptr->icon(TQString::null, FALSE); + TQString mimetype_icon = mimetype_ptr->icon(TQString(), FALSE); mimetype_iconstore [hit_item->mimetype] = mimetype_icon; return mimetype_icon; } - return TQString::null; + return TQString(); } void KMenu::slotStartService(KService::Ptr ptr) @@ -2621,7 +2621,7 @@ void KMenu::slotStartURL(const TQString& u) #ifdef KDELIBS_SUSE TQByteArray params; TQDataStream stream(params, IO_WriteOnly); - stream << 1 << -1 << TQString::null; + stream << 1 << -1 << TQString(); kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params); #else @@ -2715,13 +2715,13 @@ void KMenu::slotStartURL(const TQString& u) } kapp->propagateSessionManager(); - (void) new KRun( u, parentWidget()); + (void) new KRun( u, tqparentWidget()); } } void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos, int /*col*/ ) { - const TQObject* source = sender(); + const TQObject* source = TQT_TQOBJECT_CONST(sender()); if (!item) return; @@ -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(); } @@ -2756,7 +2756,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos m_popupMenu->insertTitle(SmallIcon(kitem->icon()),kitem->title()); - if (source==m_favoriteView) + if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_favoriteView)) { hasEntries = true; m_popupMenu->insertItem(SmallIconSet("remove"), @@ -2770,7 +2770,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos i18n("Add to Favorites"), AddToFavorites); TQStringList favs = KickerSettings::favorites(); - if (m_popupService && favs.find(m_popupService->storageId())!=favs.end()) + if (m_popupService && favs.tqfind(m_popupService->storageId())!=favs.end()) m_popupMenu->setItemEnabled(num, false); else { TQStringList::Iterator it; @@ -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())==m_popupPath.path) break; } } @@ -2788,7 +2788,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos } } - if (source!=m_exitView) { + if (TQT_BASE_OBJECT_CONST(source)!=TQT_BASE_OBJECT(m_exitView)) { if (m_popupService || (!m_popupPath.path.startsWith("kicker:/") && !m_popupPath.path.startsWith("system:/") && !m_popupPath.path.startsWith("kaddressbook:/"))) { if (hasEntries) m_popupMenu->insertSeparator(); @@ -2828,14 +2828,14 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos i18n("Put Into Run Dialog"), PutIntoRunDialog); } } - if (source==m_searchResultsWidget || ((source==m_favoriteView || source==m_recentlyView || source == m_systemView) && !m_popupService && !m_popupPath.path.startsWith("kicker:/")) ) { + if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_searchResultsWidget) || ((TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_favoriteView) || TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_recentlyView) || TQT_BASE_OBJECT_CONST(source) == TQT_BASE_OBJECT(m_systemView)) && !m_popupService && !m_popupPath.path.startsWith("kicker:/")) ) { TQString uri; if (m_popupService) uri = locate("apps", m_popupService->desktopEntryPath()); else uri = m_popupPath.path; - TQString mimetype = TQString::null; + TQString mimetype = TQString(); if ( m_popupPath.path.startsWith( "system:/media/" ) ) mimetype = media_mimetypes[m_popupPath.path]; @@ -2865,7 +2865,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos } } - if (source==m_recentlyView) { + if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_recentlyView)) { m_popupMenu->insertSeparator(); if (m_popupService) m_popupMenu->insertItem(SmallIconSet("history_clear"), @@ -2935,8 +2935,8 @@ void KMenu::slotContextMenu(int selected) case EditItem: case EditMenu: accept(); - proc = new KProcess(this); - *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); + proc = new KProcess(TQT_TQOBJECT(this)); + *proc << KStandardDirs::findExe(TQString::tqfromLatin1("kmenuedit")); *proc << "/"+m_popupPath.menuPath.section('/',-200,-2) << m_popupPath.menuPath.section('/', -1); proc->start(); break; @@ -2971,7 +2971,7 @@ void KMenu::slotContextMenu(int selected) case AddToFavorites: if (m_popupService) { - if (favs.find(m_popupService->storageId())==favs.end()) { + if (favs.tqfind(m_popupService->storageId())==favs.end()) { KService::Ptr p = KService::serviceByStorageId(m_popupService->storageId()); m_favoriteView->insertMenuItem(p, serviceMenuEndId()+favs.count()+1); favs+=m_popupService->storageId(); @@ -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())==m_popupPath.path) break; } } @@ -3010,7 +3010,7 @@ void KMenu::slotContextMenu(int selected) case RemoveFromFavorites: if (m_popupService) { - favs.erase(favs.find(m_popupService->storageId())); + favs.erase(favs.tqfind(m_popupService->storageId())); for (TQListViewItemIterator it(m_favoriteView); it.current(); ++it) { KMenuItem* kitem = static_cast<KMenuItem*>(it.current()); @@ -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())==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,7 +3331,7 @@ 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 @@ -3339,28 +3339,28 @@ TQSize KMenu::sizeHint() const 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; } @@ -3372,12 +3372,12 @@ void KMenu::slotFavoritesMoved( TQListViewItem* item, TQListViewItem* /*afterFir TQStringList favs = KickerSettings::favorites(); TQStringList::Iterator it; - TQString addFav = TQString::null; + TQString addFav = TQString(); // remove at old position if (kitem->service()) { - favs.erase(favs.find(kitem->service()->storageId())); + favs.erase(favs.tqfind(kitem->service()->storageId())); addFav = kitem->service()->storageId(); } else @@ -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())==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())==kafterNow->path()) { kdDebug() << "insert after " << kafterNow->path() << endl; favs.insert(++it,addFav); @@ -3480,7 +3480,7 @@ void KMenu::updateMedia() if ( iconName.isEmpty() ) // no user icon, query the MIME type { KMimeType::Ptr mime = KMimeType::mimeType( mimeType ); - iconName = mime->icon( TQString::null, false ); + iconName = mime->icon( TQString(), false ); } TQString descr = deviceNode; @@ -3549,7 +3549,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) if (item.m_s) { - if (favs.find(item.m_s->storageId())==favs.end()) + if (favs.tqfind(item.m_s->storageId())==favs.end()) { newItem = m_favoriteView->insertMenuItem(item.m_s, serviceMenuEndId()+favs.count()+1); favs += item.m_s->storageId(); @@ -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())==uri) break; } } @@ -3597,8 +3597,8 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) if (text.endsWith(".desktop")) { - KService::Ptr p = KService::serviceByDesktopPath(text.replace("file://",TQString::null)); - if (p && favs.find(p->storageId())==favs.end()) { + KService::Ptr p = KService::serviceByDesktopPath(text.tqreplace("file://",TQString())); + if (p && favs.tqfind(p->storageId())==favs.end()) { newItem = m_favoriteView->insertMenuItem(p, serviceMenuEndId()+favs.count()+1); favs+=p->storageId(); } @@ -3611,13 +3611,13 @@ 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())==text) break; } } if (it==favs.end()) { - KFileItem* item = new KFileItem(text, TQString::null, KFileItem::Unknown); + KFileItem* item = new KFileItem(text, TQString(), KFileItem::Unknown); KURL kurl(text); TQString file = KickerLib::newDesktopFile(text); @@ -3625,7 +3625,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) df.writeEntry("Encoding", "UTF-8"); df.writeEntry("Type","Link"); df.writeEntry("Name", item->name()); - df.writeEntry("GenericName", i18n("Directory: %1").arg(kurl.upURL().path())); + df.writeEntry("GenericName", i18n("Directory: %1").tqarg(kurl.upURL().path())); df.writeEntry("Icon", item->iconName()); df.writeEntry("URL", text); 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..6fe731933 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) ); + tqstyle().tqdrawControl( TQStyle::CE_TabBarTab, p, this, t->rect(), + tqcolorGroup(), flags, TQStyleOption(t) ); paintLabel( p, t->rect(), t, t->identifier() == keyboardFocusTab() ); } @@ -70,11 +70,11 @@ 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 = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabVSpace, this ); p->setFont( font() ); TQFontMetrics fm = p->fontMetrics(); - int fw = fm.size( Qt::SingleLine|Qt::ShowPrefix, t->text() ).width(); + int fw = fm.size( TQt::SingleLine|TQt::ShowPrefix, t->text() ).width(); TQRect rt(r); rt.setWidth(fw); @@ -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(), + tqstyle().tqdrawControl( TQStyle::CE_TabBarLabel, p, this, rt, + t->isEnabled() ? tqcolorGroup(): tqpalette().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() { - 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 = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, this ); + int vframe = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabVSpace, this ); + int overlap = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, this ); TQSize s; for (int t = 0; t < count(); ++t) @@ -155,13 +155,13 @@ void KickoffTabBar::layoutTabs() h += 4 + s.height() + 4; TQRect r = tab->rect(); - int fw = fm.size( Qt::SingleLine|Qt::ShowPrefix, tab->text() ).width(); + int fw = fm.size( TQt::SingleLine|TQt::ShowPrefix, tab->text() ).width(); int iw = 0; if ( tab->iconSet() != 0 ) iw = tab->iconSet()->pixmap( TQIconSet::Large, TQIconSet::Normal ).width(); int w = QMAX(iw, fw + 6 + 6 ) + hframe; h += ((KickerSettings::kickoffTabBarFormat() != KickerSettings::IconOnly) ? fm.height() : 0) + vframe; - tab->setRect(TQRect(TQPoint(x, 0), style().sizeFromContents(TQStyle::CT_TabBarTab, this, + tab->setRect(TQRect(TQPoint(x, 0), tqstyle().tqsizeFromContents(TQStyle::CT_TabBarTab, this, TQSize(w, h), TQStyleOption(tab)))); x += tab->rect().width() - overlap; } @@ -185,7 +185,7 @@ void KickoffTabBar::dragMoveEvent(TQDragMoveEvent* event) void KickoffTabBar::mousePressEvent( TQMouseEvent * e ) { - if ( e->button() != LeftButton ) { + if ( e->button() != Qt::LeftButton ) { e->ignore(); return; } diff --git a/kicker/kicker/ui/kickoff_bar.h b/kicker/kicker/ui/kickoff_bar.h index 2330ffe39..55f94c3dd 100644 --- a/kicker/kicker/ui/kickoff_bar.h +++ b/kicker/kicker/ui/kickoff_bar.h @@ -32,7 +32,7 @@ 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; diff --git a/kicker/kicker/ui/kmenuitembase.ui b/kicker/kicker/ui/kmenuitembase.ui index 0cbea1155..0b49763a1 100644 --- a/kicker/kicker/ui/kmenuitembase.ui +++ b/kicker/kicker/ui/kmenuitembase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KMenuItemBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KMenuItemBase</cstring> </property> @@ -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> @@ -42,7 +42,7 @@ <property name="margin"> <number>2</number> </property> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>layout11</cstring> </property> @@ -50,7 +50,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>itemTitle</cstring> </property> @@ -73,11 +73,11 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>itemDescription</cstring> </property> @@ -102,13 +102,13 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>layout4</cstring> </property> @@ -116,11 +116,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <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> diff --git a/kicker/kicker/ui/nonKDEButtonSettings.ui b/kicker/kicker/ui/nonKDEButtonSettings.ui index 5c44aca85..a3f04e6a8 100644 --- a/kicker/kicker/ui/nonKDEButtonSettings.ui +++ b/kicker/kicker/ui/nonKDEButtonSettings.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>NonKDEButtonSettings</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>NonKDEButtonSettings</cstring> </property> @@ -30,7 +30,7 @@ <string>Enter the name of the executable file to be run when this button is selected. If it is not in your $PATH then you will need to provide an absolute path.</string> </property> </widget> - <widget class="QLabel" row="8" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="8" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -46,7 +46,7 @@ <i>Example</i>: For the command `rm -rf` enter "-rf" in this text box.</string> </property> </widget> - <widget class="QCheckBox" row="10" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="10" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_inTerm</cstring> </property> @@ -57,7 +57,7 @@ <string>Select this option if the command is a command line application and you wish to be able to see its output when run.</string> </property> </widget> - <widget class="QLineEdit" row="9" column="0" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="9" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_commandLine</cstring> </property> @@ -67,7 +67,7 @@ <i>Example</i>: For the command `rm -rf` enter "-rf" in this text box.</string> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -81,7 +81,7 @@ <string>Enter the name of the executable file to be run when this button is selected. If it is not in your $PATH then you will need to provide an absolute path.</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>m_title</cstring> </property> @@ -97,7 +97,7 @@ <string>Enter the name you would like to appear for this button here.</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -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> @@ -159,7 +159,7 @@ <number>48</number> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -173,7 +173,7 @@ <string>Enter the name you would like to appear for this button here.</string> </property> </widget> - <widget class="QLineEdit" row="5" column="0" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_description</cstring> </property> @@ -199,7 +199,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>8</height> diff --git a/kicker/kicker/ui/popupmenutitle.h b/kicker/kicker/ui/popupmenutitle.h index 439fc195f..e5f565c1a 100644 --- a/kicker/kicker/ui/popupmenutitle.h +++ b/kicker/kicker/ui/popupmenutitle.h @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kapplication.h> -class PopupMenuTitle : public QCustomMenuItem +class PopupMenuTitle : public TQCustomMenuItem { public: PopupMenuTitle(const TQString &name, const TQFont &font); @@ -46,7 +46,7 @@ public: { p->save(); TQRect r(x, y, w, h); - kapp->style().drawPrimitive(TQStyle::PE_HeaderSection, + kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_HeaderSection, p, r, cg); if (!m_desktopName.isEmpty()) @@ -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->tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1)); return size; } diff --git a/kicker/kicker/ui/query.cpp b/kicker/kicker/ui/query.cpp index 12b9b6910..0bcff59c1 100644 --- a/kicker/kicker/ui/query.cpp +++ b/kicker/kicker/ui/query.cpp @@ -111,7 +111,7 @@ bool Query::matches(const TQString &term) bool next_alternative = false; for ( TQStringList::ConstIterator it = alt->excludes.begin(); it != alt->excludes.end(); ++it ) { - if ( lower_term.find(*it)!=-1 ) { + if ( lower_term.tqfind(*it)!=-1 ) { next_alternative = true; continue; } @@ -120,7 +120,7 @@ bool Query::matches(const TQString &term) continue; for ( TQStringList::ConstIterator it = alt->includes.begin(); it != alt->includes.end(); ++it ) { - if ( lower_term.find(*it)==-1 ) { + if ( lower_term.tqfind(*it)==-1 ) { next_alternative = true; continue; } 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/removeapplet_mnu.h b/kicker/kicker/ui/removeapplet_mnu.h index b444b8540..895ded710 100644 --- a/kicker/kicker/ui/removeapplet_mnu.h +++ b/kicker/kicker/ui/removeapplet_mnu.h @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class ContainerArea; -class PanelRemoveAppletMenu : public QPopupMenu +class PanelRemoveAppletMenu : public TQPopupMenu { Q_OBJECT diff --git a/kicker/kicker/ui/removebutton_mnu.h b/kicker/kicker/ui/removebutton_mnu.h index d326a2f62..211edd771 100644 --- a/kicker/kicker/ui/removebutton_mnu.h +++ b/kicker/kicker/ui/removebutton_mnu.h @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class ContainerArea; -class PanelRemoveButtonMenu : public QPopupMenu +class PanelRemoveButtonMenu : public TQPopupMenu { Q_OBJECT diff --git a/kicker/kicker/ui/removecontainer_mnu.h b/kicker/kicker/ui/removecontainer_mnu.h index 6dd28dc30..bd6d03d89 100644 --- a/kicker/kicker/ui/removecontainer_mnu.h +++ b/kicker/kicker/ui/removecontainer_mnu.h @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class ContainerArea; -class RemoveContainerMenu : public QPopupMenu +class RemoveContainerMenu : public TQPopupMenu { Q_OBJECT 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/removeextension_mnu.h b/kicker/kicker/ui/removeextension_mnu.h index 2fc83008a..e77522bc8 100644 --- a/kicker/kicker/ui/removeextension_mnu.h +++ b/kicker/kicker/ui/removeextension_mnu.h @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "container_extension.h" -class PanelRemoveExtensionMenu : public QPopupMenu +class PanelRemoveExtensionMenu : public TQPopupMenu { Q_OBJECT diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index 3042eddfe..76aa6162e 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/kicker/kicker/ui/service_mnu.cpp @@ -231,7 +231,7 @@ 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("&", "&&"); + groupCaption.tqreplace("&", "&&"); if ( nbChildCount == 1 && g->allowInline() && g->inlineAlias()) { @@ -411,10 +411,10 @@ void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId, if (KickerSettings::menuEntryFormat() == KickerSettings::NameAndDescription) { if ((!suppressGenericNames || - !suppressGenericNames->contains(s->untranslatedGenericName())) && - serviceName.find(comment, 0, true) == -1) + !suppressGenericNames->tqcontains(s->untranslatedGenericName())) && + serviceName.tqfind(comment, 0, true) == -1) { - if (comment.find(serviceName, 0, true) == -1) + if (comment.tqfind(serviceName, 0, true) == -1) { serviceName = i18n("Entries in K-menu: %1 app name, %2 description", "%1 - %2").arg(serviceName, comment); } @@ -450,7 +450,7 @@ void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId, // item names may contain ampersands. To avoid them being converted // to accelerators, replace them with two ampersands. - serviceName.replace("&", "&&"); + 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; } @@ -569,7 +569,7 @@ void PanelServiceMenu::mousePressEvent(TQMouseEvent * ev) void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev) { - if (ev->button() == RightButton && !Kicker::the()->isKioskImmutable()) + if (ev->button() == Qt::RightButton && !Kicker::the()->isKioskImmutable()) { int id = idAt( ev->pos() ); @@ -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; @@ -694,8 +694,8 @@ void PanelServiceMenu::slotContextMenu(int selected) } case EditItem: - proc = new KProcess(this); - *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); + proc = new KProcess(TQT_TQOBJECT(this)); + *proc << KStandardDirs::findExe(TQString::tqfromLatin1("kmenuedit")); *proc << "/"+relPath_ << static_cast<KService *>(contextKSycocaEntry_)->menuId(); proc->start(); break; @@ -738,8 +738,8 @@ void PanelServiceMenu::slotContextMenu(int selected) } case EditMenu: - proc = new KProcess(this); - *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); + proc = new KProcess(TQT_TQOBJECT(this)); + *proc << KStandardDirs::findExe(TQString::tqfromLatin1("kmenuedit")); *proc << "/"+static_cast<KServiceGroup *>(contextKSycocaEntry_)->relPath(); proc->start(); break; @@ -756,7 +756,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev) if (Kicker::the()->isKioskImmutable()) return; - if ( (ev->state() & LeftButton ) != LeftButton ) + if ( (ev->state() & Qt::LeftButton ) != Qt::LeftButton ) return; TQPoint p = ev->pos() - startPos_; @@ -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 (!TQT_TQRECT_OBJECT(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..9d1305da3 100644 --- a/kicker/libkicker/global.cpp +++ b/kicker/libkicker/global.cpp @@ -110,7 +110,7 @@ KPanelApplet::Direction positionToDirection(KPanelExtension::Position p) } } -KPanelApplet::Direction arrowToDirection(Qt::ArrowType p) +KPanelApplet::Direction arrowToDirection(TQt::ArrowType p) { switch (p) { @@ -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; @@ -207,7 +207,7 @@ TQPopupMenu* reduceMenu(TQPopupMenu *menu) return menu; } - TQMenuItem *item = menu->findItem(menu->idAt(0)); + TQMenuItem *item = menu->tqfindItem(menu->idAt(0)); if (item->popup()) { @@ -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; } } @@ -328,7 +328,7 @@ void colorize(TQImage& image) { KConfig *config = KGlobal::config(); config->setGroup("WM"); - TQColor color = TQApplication::palette().active().highlight(); + TQColor color = TQApplication::tqpalette().active().highlight(); TQColor activeTitle = config->readColorEntry("activeBackground", &color); TQColor inactiveTitle = config->readColorEntry("inactiveBackground", &color); @@ -336,7 +336,7 @@ void colorize(TQImage& image) int h1, s1, v1, h2, s2, v2, h3, s3, v3; activeTitle.hsv(&h1, &s1, &v1); inactiveTitle.hsv(&h2, &s2, &v2); - TQApplication::palette().active().background().hsv(&h3, &s3, &v3); + TQApplication::tqpalette().active().background().hsv(&h3, &s3, &v3); if ( (kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < kAbs(h2-h3)+kAbs(s2-s3)+kAbs(v2-v3)) && ((kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < 32) || (s1 < 32)) && (s2 > s1)) @@ -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)); @@ -437,12 +437,12 @@ TQIconSet menuIconSet(const TQString& icon) // make sure they are not larger than 20x20 if (normal.width() > 20 || normal.height() > 20) { - normal.convertFromImage(normal.convertToImage().smoothScale(20,20)); + normal.convertFromImage(TQImage(normal.convertToImage()).smoothScale(20,20)); } if (active.width() > 20 || active.height() > 20) { - active.convertFromImage(active.convertToImage().smoothScale(20,20)); + active.convertFromImage(TQImage(active.convertToImage()).smoothScale(20,20)); } iconset.setPixmap(normal, TQIconSet::Small, TQIconSet::Normal); diff --git a/kicker/libkicker/global.h b/kicker/libkicker/global.h index 0a4677914..663987174 100644 --- a/kicker/libkicker/global.h +++ b/kicker/libkicker/global.h @@ -40,7 +40,7 @@ namespace KickerLib KDE_EXPORT KPanelExtension::Position directionToPosition(KPanelApplet::Direction d); KDE_EXPORT KPanelExtension::Position directionToPopupPosition(KPanelApplet::Direction d); KDE_EXPORT KPanelApplet::Direction positionToDirection(KPanelExtension::Position p); -KDE_EXPORT KPanelApplet::Direction arrowToDirection(Qt::ArrowType p); +KDE_EXPORT KPanelApplet::Direction arrowToDirection(TQt::ArrowType p); KDE_EXPORT int sizeValue(KPanelExtension::Size s); /** diff --git a/kicker/libkicker/kickerSettings.kcfg b/kicker/libkicker/kickerSettings.kcfg index 0f725c35f..75de298a3 100644 --- a/kicker/libkicker/kickerSettings.kcfg +++ b/kicker/libkicker/kickerSettings.kcfg @@ -64,7 +64,7 @@ <entry name="TintColor" type="Color" > <label>The tint color used to colorize transparent panels</label> - <default code="true">(QApplication::palette().active().mid())</default> + <default code="true">(TQApplication::tqpalette().active().mid())</default> <whatsthis>This option sets the color to use when tinting transparent panels</whatsthis> </entry> diff --git a/kicker/libkicker/kickerSettings.kcfgc b/kicker/libkicker/kickerSettings.kcfgc index 59c271928..8e0b42d93 100644 --- a/kicker/libkicker/kickerSettings.kcfgc +++ b/kicker/libkicker/kickerSettings.kcfgc @@ -3,6 +3,6 @@ Singleton=true ClassName=KickerSettings Mutators=true Visibility=KDE_EXPORT -IncludeFiles=qapplication.h +IncludeFiles=tqapplication.h GlobalEnums=true MemberVariables=dpointer diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp index 586360904..69e0897f8 100644 --- a/kicker/libkicker/kickertip.cpp +++ b/kicker/libkicker/kickertip.cpp @@ -76,7 +76,7 @@ KickerTip::KickerTip(TQWidget * parent) m_timer(0, "KickerTip::m_timer"), m_frameTimer(0, "KickerTip::m_frameTimer") { - setFocusPolicy(NoFocus); + setFocusPolicy(TQ_NoFocus); setBackgroundMode(NoBackground); resize(0, 0); hide(); @@ -146,7 +146,7 @@ void KickerTip::display() delete m_richText; m_richText = new TQSimpleRichText("<qt><h3>" + data.message + "</h3><p>" + - data.subtext + "</p></qt>", font(), TQString::null, 0, + data.subtext + "</p></qt>", font(), TQString(), 0, m_mimeFactory); m_richText->setWidth(640); m_direction = data.direction; @@ -308,7 +308,7 @@ void KickerTip::dissolveMask() if (m_dissolveSize > 0) { - maskPainter.setRasterOp(Qt::EraseROP); + maskPainter.setRasterOp(TQt::EraseROP); int x, y, s; const int size = 16; @@ -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); } } @@ -452,13 +452,13 @@ void KickerTip::tipperDestroyed(TQObject* o) { // we can't do a dynamic cast because we are in the process of dieing // so static it is. - untipFor(static_cast<TQWidget*>(o)); + untipFor(TQT_TQWIDGET(o)); } void KickerTip::internalUpdate() { m_dirty = true; - repaint(false); + tqrepaint(false); } void KickerTip::enableTipping(bool tip) @@ -508,7 +508,7 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event) return false; } - TQWidget *widget = static_cast<TQWidget*>(object); + TQWidget *widget = TQT_TQWIDGET(object); switch (event->type()) { @@ -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..b7332967f 100644 --- a/kicker/libkicker/kickertip.h +++ b/kicker/libkicker/kickertip.h @@ -38,7 +38,7 @@ class TQPaintEvent; class TQSimpleRichText; class TQTimer; -class KDE_EXPORT KickerTip : public QWidget +class KDE_EXPORT KickerTip : public TQWidget { Q_OBJECT diff --git a/kicker/libkicker/kshadowengine.cpp b/kicker/libkicker/kshadowengine.cpp index 19ccc669d..a933026d5 100644 --- a/kicker/libkicker/kshadowengine.cpp +++ b/kicker/libkicker/kshadowengine.cpp @@ -78,7 +78,7 @@ TQImage KShadowEngine::makeShadow(const TQPixmap& textPixmap, const TQColor &bgC /* * This is the source pixmap */ - TQImage img = textPixmap.convertToImage().convertDepth(32); + TQImage img = TQImage(textPixmap.convertToImage()).convertDepth(32); /* * Resize the image if necessary @@ -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..8d2e6acdb 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"); @@ -64,5 +64,5 @@ KPanelMenu* MenuInfo::load(TQWidget *parent, const char *name) return KParts::ComponentFactory::createInstanceFromLibrary<KPanelMenu>( TQFile::encodeName( library_ ), - parent, name ); + TQT_TQOBJECT(parent), name ); } diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp index a04e9aee0..0edae6987 100644 --- a/kicker/libkicker/panelbutton.cpp +++ b/kicker/libkicker/panelbutton.cpp @@ -69,7 +69,7 @@ PanelButton::PanelButton( TQWidget* parent, const char* name ) m_arrowDirection(KPanelExtension::Bottom), m_popupDirection(KPanelApplet::Up), m_iconAlignment(AlignCenter), - m_orientation(Horizontal), + m_orientation(Qt::Horizontal), m_size((KIcon::StdSizes)-1), m_fontPercent(0.40) { @@ -190,7 +190,7 @@ void PanelButton::setPopupDirection(KPanelApplet::Direction d) setArrowDirection(KickerLib::directionToPopupPosition(d)); } -void PanelButton::setIconAlignment(AlignmentFlags align) +void PanelButton::setIconAlignment(TQ_Alignment align) { m_iconAlignment = align; update(); @@ -296,7 +296,7 @@ int PanelButton::widthForHeight(int height) const // we only paint the text when horizontal, so make sure we're horizontal // before adding the text in here - if (orientation() == Horizontal && !m_buttonText.isEmpty()) + if (orientation() == Qt::Horizontal && !m_buttonText.isEmpty()) { TQFont f(font()); //f.setPixelSize(KMIN(height, KMAX(int(float(height) * m_fontPercent), 16))); @@ -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); @@ -471,7 +471,7 @@ void PanelButton::dropEvent(TQDropEvent* e) void PanelButton::mouseMoveEvent(TQMouseEvent *e) { - if (!m_isLeftMouseButtonDown || (e->state() & LeftButton) == 0) + if (!m_isLeftMouseButtonDown || (e->state() & Qt::LeftButton) == 0) { return; } @@ -489,7 +489,7 @@ void PanelButton::mouseMoveEvent(TQMouseEvent *e) void PanelButton::mousePressEvent(TQMouseEvent *e) { - if (e->button() == LeftButton) + if (e->button() == Qt::LeftButton) { m_lastLeftMouseButtonPress = e->pos(); m_isLeftMouseButtonDown = true; @@ -499,7 +499,7 @@ void PanelButton::mousePressEvent(TQMouseEvent *e) void PanelButton::mouseReleaseEvent(TQMouseEvent *e) { - if (e->button() == LeftButton) + if (e->button() == Qt::LeftButton) { m_isLeftMouseButtonDown = false; @@ -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()); + tqstyle().tqdrawPrimitive(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. + tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup(), TQStyle::Style_Sunken); } drawButtonLabel(p); @@ -556,10 +556,10 @@ void PanelButton::drawButton(TQPainter *p) if (hasFocus() || m_hasAcceptedDrag) { int x1, y1, x2, y2; - rect().coords(&x1, &y1, &x2, &y2); + TQT_TQRECT_OBJECT(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()); + tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, tqcolorGroup(), + TQStyle::Style_Default, tqcolorGroup().button()); } } @@ -570,7 +570,7 @@ void PanelButton::drawButtonLabel(TQPainter *p) if (active) { - icon = icon.convertToImage().smoothScale(icon.width() - 2, + icon = TQImage(icon.convertToImage()).smoothScale(icon.width() - 2, icon.height() - 2); } @@ -580,7 +580,7 @@ void PanelButton::drawButtonLabel(TQPainter *p) else if (m_iconAlignment & AlignBottom) y = (height() - icon.height()); - if (!m_buttonText.isEmpty() && orientation() == Horizontal) + if (!m_buttonText.isEmpty() && orientation() == Qt::Horizontal) { int h = height(); int w = width(); @@ -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 = tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator); TQRect r((width() - arrowSize)/2, 0, arrowSize, arrowSize); switch (m_arrowDirection) @@ -684,7 +684,7 @@ void PanelButton::drawButtonLabel(TQPainter *p) r = TQRect(0, (height() - arrowSize)/2, arrowSize, arrowSize); break; case KPanelExtension::Floating: - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { e = TQStyle::PE_ArrowDown; r.moveBy(0, height() - arrowSize); @@ -707,7 +707,7 @@ void PanelButton::drawButtonLabel(TQPainter *p) { flags |= TQStyle::Style_Down; } - style().drawPrimitive(e, p, r, colorGroup(), flags); + tqstyle().tqdrawPrimitive(e, p, r, tqcolorGroup(), flags); } } @@ -730,7 +730,7 @@ int PanelButton::preferredIconSize(int proposed_size) const if (proposed_size < 0) { - proposed_size = (orientation() == Horizontal) ? height() : width(); + proposed_size = (orientation() == Qt::Horizontal) ? height() : width(); } // determine the upper limit on the size. Normally, this is panelSize, @@ -922,8 +922,8 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) { if (e->type() == TQEvent::MouseMove) { - TQMouseEvent *me = static_cast<TQMouseEvent *>(e); - if (rect().contains(mapFromGlobal(me->globalPos())) && + TQMouseEvent *me = TQT_TQMOUSEEVENT(e); + if (TQT_TQRECT_OBJECT(rect()).tqcontains(mapFromGlobal(me->globalPos())) && ((me->state() & ControlButton) != 0 || (me->state() & ShiftButton) != 0)) { @@ -934,8 +934,8 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) else if (e->type() == TQEvent::MouseButtonPress || e->type() == TQEvent::MouseButtonDblClick) { - TQMouseEvent *me = static_cast<TQMouseEvent *>(e); - if (rect().contains(mapFromGlobal(me->globalPos()))) + TQMouseEvent *me = TQT_TQMOUSEEVENT(e); + if (TQT_TQRECT_OBJECT(rect()).tqcontains(mapFromGlobal(me->globalPos()))) { m_pressedDuringPopup = true; return true; @@ -943,8 +943,8 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) } else if (e->type() == TQEvent::MouseButtonRelease) { - TQMouseEvent *me = static_cast<TQMouseEvent *>(e); - if (rect().contains(mapFromGlobal(me->globalPos()))) + TQMouseEvent *me = TQT_TQMOUSEEVENT(e); + if (TQT_TQRECT_OBJECT(rect()).tqcontains(mapFromGlobal(me->globalPos()))) { if (m_pressedDuringPopup && m_popup) { diff --git a/kicker/libkicker/panelbutton.h b/kicker/libkicker/panelbutton.h index 770d0e1be..ff0f5f2a8 100644 --- a/kicker/libkicker/panelbutton.h +++ b/kicker/libkicker/panelbutton.h @@ -258,7 +258,7 @@ public slots: protected: - void setIconAlignment(AlignmentFlags align); + void setIconAlignment(TQ_Alignment align); /** * Subclasses must implement this to define the name of the button which is * used to identify this button for saving and loading. It must be unique @@ -393,7 +393,7 @@ private: TQPixmap m_iconz; // mouse over KPanelExtension::Position m_arrowDirection; KPanelApplet::Direction m_popupDirection; - AlignmentFlags m_iconAlignment; + TQ_Alignment m_iconAlignment; Orientation m_orientation; int m_size; double m_fontPercent; 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..7388f4dbc 100644 --- a/kicker/libkicker/paneldrag.h +++ b/kicker/libkicker/paneldrag.h @@ -32,14 +32,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class BaseContainer; -class KDE_EXPORT PanelDrag : public QDragObject +class KDE_EXPORT PanelDrag : public TQDragObject { public: PanelDrag(BaseContainer* container, TQWidget *dragSource); ~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); @@ -48,14 +48,14 @@ class KDE_EXPORT PanelDrag : public QDragObject TQByteArray a; }; -class KDE_EXPORT AppletInfoDrag : public QDragObject +class KDE_EXPORT AppletInfoDrag : public TQDragObject { public: AppletInfoDrag(const AppletInfo& container, TQWidget *dragSource); ~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..1dc592bbd 100644 --- a/kicker/libkicker/panner.cpp +++ b/kicker/libkicker/panner.cpp @@ -57,7 +57,7 @@ Panner::Panner( TQWidget* parent, const char* name ) // layout _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight); _layout->addWidget(_clipper, 1); - setOrientation(Horizontal); + setOrientation(Qt::Horizontal); } Panner::~Panner() @@ -97,14 +97,14 @@ void Panner::createScrollButtons() void Panner::setupButtons() { - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { if (_luSB) { _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); @@ -117,8 +117,8 @@ 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); @@ -149,7 +149,7 @@ void Panner::resizeEvent( TQResizeEvent* ) void Panner::scrollRightDown() { - if(orientation() == Horizontal) // scroll right + if(orientation() == Qt::Horizontal) // scroll right scrollBy( _step, 0 ); else // scroll down scrollBy( 0, _step ); @@ -159,7 +159,7 @@ void Panner::scrollRightDown() void Panner::scrollLeftUp() { - if(orientation() == Horizontal) // scroll left + if(orientation() == Qt::Horizontal) // scroll left scrollBy( -_step, 0 ); else // scroll up scrollBy( 0, -_step ); @@ -197,7 +197,7 @@ void Panner::reallyUpdateScrollButtons() _updateScrollButtonsTimer->stop(); - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { delta = contentsWidth() - width(); } @@ -336,7 +336,7 @@ void Panner::ensureVisible( int x, int y, int xmargin, int ymargin ) bool Panner::eventFilter( TQObject *obj, TQEvent *e ) { - if ( obj == _viewport || obj == _clipper ) + if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(_viewport) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(_clipper) ) { switch ( e->type() ) { diff --git a/kicker/libkicker/panner.h b/kicker/libkicker/panner.h index 66ce6cd18..2f09d76f1 100644 --- a/kicker/libkicker/panner.h +++ b/kicker/libkicker/panner.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class TQBoxLayout; class TQTimer; -class KDE_EXPORT Panner : public QWidget +class KDE_EXPORT Panner : public TQWidget { Q_OBJECT @@ -39,10 +39,10 @@ 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); + virtual void setOrientation(Qt::Orientation orientation); TQWidget *viewport() const { return _viewport; } @@ -59,8 +59,8 @@ public: void contentsToViewport( int x, int y, int& vx, int& vy ) const; void viewportToContents( int vx, int vy, int& x, int& y ) const; - QPoint contentsToViewport( const TQPoint& ) const; - QPoint viewportToContents( const TQPoint& ) const; + TQPoint contentsToViewport( const TQPoint& ) const; + TQPoint viewportToContents( const TQPoint& ) const; void addChild(TQWidget *child) { child->show(); } void removeChild(TQWidget *child) { child->hide(); } diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp index 4c28b2101..aafbc4316 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()); } @@ -101,7 +101,7 @@ void SimpleButton::drawButtonLabel( TQPainter *p ) if (isOn() || isDown()) { - pix = pix.convertToImage().smoothScale(pix.width() - 2, + pix = TQImage(pix.convertToImage()).smoothScale(pix.width() - 2, pix.height() - 2); } @@ -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); + tqstyle().tqdrawPrimitive(pe, p, r, tqcolorGroup(), flags); } void SimpleArrowButton::enterEvent( TQEvent *e ) diff --git a/kicker/libkicker/simplebutton.h b/kicker/libkicker/simplebutton.h index 1ea5c7a44..e6416236f 100644 --- a/kicker/libkicker/simplebutton.h +++ b/kicker/libkicker/simplebutton.h @@ -26,7 +26,7 @@ #include <kdemacros.h> -class KDE_EXPORT SimpleButton : public QButton +class KDE_EXPORT SimpleButton : public TQButton { Q_OBJECT @@ -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..860f6d04a 100644 --- a/kicker/menuext/kate/katesessionmenu.cpp +++ b/kicker/menuext/kate/katesessionmenu.cpp @@ -112,7 +112,7 @@ void KateSessionMenu::slotExec( int id ) TQString name = KInputDialog::getText( i18n("Session Name"), i18n("Please enter a name for the new session"), TQString::null, - &ok, 0, 0, new Validator( m_parent ) ); + &ok, 0, 0, new Validator( TQT_TQOBJECT(m_parent) ) ); if ( ! ok ) return; @@ -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 ) diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp index afd1127f6..be060b75c 100644 --- a/kicker/menuext/konsole/konsole_mnu.cpp +++ b/kicker/menuext/konsole/konsole_mnu.cpp @@ -185,7 +185,7 @@ void KonsoleMenu::initialize() screenList.append(TQFile::decodeName(entry->d_name)); insertItem(SmallIconSet("konsole"), i18n("Screen is a program controlling screens!", - "Screen at %1").arg(entry->d_name), id); + "Screen at %1").tqarg(entry->d_name), id); id++; } } diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp index 46967b54c..58417e9f4 100644 --- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp +++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp @@ -84,7 +84,7 @@ void KonsoleBookmarkHandler::slotNewBookmark( const TQString& /*text*/, { *m_importStream << "<bookmark icon=\"" << KMimeType::iconForURL( KURL( url ) ); *m_importStream << "\" href=\"" << TQString::fromUtf8(url) << "\">\n"; - *m_importStream << "<title>" << (additionalInfo.isEmpty() ? TQString::fromUtf8(url) : additionalInfo) << "</title>\n</bookmark>\n"; + *m_importStream << "<title>" << (additionalInfo.isEmpty() ? TQString(TQString::fromUtf8(url)) : additionalInfo) << "</title>\n</bookmark>\n"; } void KonsoleBookmarkHandler::slotNewFolder( const TQString& text, bool /*open*/, diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp index 1a31fe55c..b53899a89 100644 --- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp +++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp @@ -112,7 +112,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() 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; @@ -168,7 +168,7 @@ void KonsoleBookmarkMenu::slotBookmarkSelected() if ( !m_pOwner ) return; // this view doesn't handle bookmarks... a = (KAction*)sender(); b = a->text(); - m_kOwner->openBookmarkURL( TQString::fromUtf8(sender()->name()), /* URL */ + m_kOwner->openBookmarkURL( TQString::fromUtf8(TQT_TQOBJECT_CONST(sender())->name()), /* URL */ ( (KAction *)sender() )->text() /* Title */ ); } @@ -177,7 +177,7 @@ void KonsoleBookmarkMenu::slotNSBookmarkSelected() KAction *a; TQString b; - TQString link(sender()->name()+8); + TQString link(TQT_TQOBJECT_CONST(sender())->name()+8); a = (KAction*)sender(); b = a->text(); m_kOwner->openBookmarkURL( link, /*URL */ diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp index 0c072e026..936d8a536 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); } @@ -120,7 +120,7 @@ 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("&", "&&"); + serviceName.tqreplace("&", "&&"); int newId = insertItem(KickerLib::menuIconSet(s->icon()), serviceName, nId, nIndex); m_entryMap.insert(newId, static_cast<KSycocaEntry*>(s)); @@ -136,7 +136,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev) { KPanelMenu::mouseMoveEvent(ev); - if ((ev->state() & LeftButton) != LeftButton) + if ((ev->state() & Qt::LeftButton) != Qt::LeftButton) { return; } @@ -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 (!TQT_TQRECT_OBJECT(frameGeometry()).tqcontains(TQCursor::pos())) { KURLDrag::setTarget(0); } @@ -297,7 +297,7 @@ void PrefMenu::initialize() // Item names may contain ampersands. To avoid them being converted // to accelerators, replace each ampersand with two ampersands. - groupCaption.replace("&", "&&"); + 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..381ce3fa9 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("&&") )); } } @@ -111,10 +111,10 @@ void RecentDocsMenu::mousePressEvent(TQMouseEvent* e) { void RecentDocsMenu::mouseMoveEvent(TQMouseEvent* e) { KPanelMenu::mouseMoveEvent(e); - if (!(e->state() & LeftButton)) + if (!(e->state() & Qt::LeftButton)) return; - if (!rect().contains(_mouseDown)) + if (!TQT_TQRECT_OBJECT(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/tom.cc b/kicker/menuext/tom/tom.cc index 3a4ebf4ed..3bd5e0a80 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; } } @@ -302,7 +302,7 @@ int TOM::appendTaskGroup(KConfig& config, bool inSubMenu) TQString name = config.readEntry("Name"); // in case the name contains an ampersand, double 'em up - name.replace("&", "&&"); + name.tqreplace("&", "&&"); TQString desktopfile = config.readPathEntry("DesktopFile"); KService::Ptr pService = KService::serviceByDesktopPath(desktopfile); @@ -551,10 +551,10 @@ void TOM::initialize() if (userInfo) { username = TQString::fromLocal8Bit(userInfo->pw_gecos); - if (username.find(',') != -1) + if (username.tqfind(',') != -1) { // Remove everything from and including first comma - username.truncate(username.find(',')); + username.truncate(username.tqfind(',')); } if (username.isEmpty()) @@ -583,7 +583,7 @@ void TOM::contextualizeRMBmenu(KPopupMenu* menu, int menuItem, TQPopupMenu* ctxM ctxMenu->removeItem(contextMenuTitleID); TQString text = menu->text(menuItem); - int parens = text.find('(') - 1; + int parens = text.tqfind('(') - 1; if (parens > 0) { text = text.left(parens); @@ -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..312c78f97 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -134,7 +134,7 @@ AppletProxy::AppletProxy(TQObject* parent, const char* name) exit(0); } - if (!kapp->dcopClient()->registerAs("applet_proxy", true)) { + if (kapp->dcopClient()->registerAs("applet_proxy", true) == 0) { kdError() << "Failed to register at DCOP server." << endl; KMessageBox::error(0, i18n("The applet proxy could not be started due to DCOP registration problems."), @@ -226,24 +226,24 @@ 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(); + const TQObjectList children = widget->childrenListObject(); - if (!children) + if (children.isEmpty()) { return; } - TQObjectList::iterator it = children->begin(); - for (; it != children->end(); ++it) + TQObjectList::iterator it = children.begin(); + for (; it != children.end(); ++it) { 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->setBackgroundMode(TQt::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/extensiondebugger.h b/kicker/proxy/extensiondebugger.h index 87ac76ecb..0f4719b9f 100644 --- a/kicker/proxy/extensiondebugger.h +++ b/kicker/proxy/extensiondebugger.h @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class AppletInfo; class KPanelExtension; -class ExtensionContainer : public QWidget +class ExtensionContainer : public TQWidget { Q_OBJECT diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index 3d931c95b..d4b4d67d6 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -113,7 +113,7 @@ ExtensionProxy::ExtensionProxy(TQObject* parent, const char* name) exit(0); } - if (!kapp->dcopClient()->registerAs("extension_proxy", true)) { + if (kapp->dcopClient()->registerAs("extension_proxy", true) == 0) { kdError() << "Failed to register at DCOP server." << endl; exit(0); } @@ -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/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp index 808408fc9..b2159c196 100644 --- a/kicker/taskbar/taskbar.cpp +++ b/kicker/taskbar/taskbar.cpp @@ -66,7 +66,7 @@ TaskBar::TaskBar( TQWidget *parent, const char *name ) blocklayout = true; // init - setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); // setup animation frames for (int i = 1; i < 11; i++) @@ -117,7 +117,7 @@ TaskBar::TaskBar( TQWidget *parent, const char *name ) blocklayout = false; connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); - keys = new KGlobalAccel( this ); + keys = new KGlobalAccel( TQT_TQOBJECT(this) ); #include "taskbarbindings.cpp" keys->readSettings(); keys->updateConnections(); @@ -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 @@ -358,7 +358,7 @@ void TaskBar::add(Startup::Ptr startup) it != containers.end(); ++it) { - if ((*it)->contains(startup)) + if ((*it)->tqcontains(startup)) { return; } @@ -372,7 +372,7 @@ void TaskBar::add(Startup::Ptr startup) void TaskBar::showTaskContainer(TaskContainer* container) { - TaskContainer::List::iterator it = m_hiddenContainers.find(container); + TaskContainer::List::iterator it = m_hiddenContainers.tqfind(container); if (it != m_hiddenContainers.end()) { m_hiddenContainers.erase(it); @@ -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; @@ -464,7 +464,7 @@ void TaskBar::remove(Task::Ptr task, TaskContainer* container) if (container->isEmpty()) { - TaskContainer::List::iterator it = containers.find(container); + TaskContainer::List::iterator it = containers.tqfind(container); if (it != containers.end()) { containers.erase(it); @@ -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; @@ -530,7 +530,7 @@ void TaskBar::remove(Startup::Ptr startup, TaskContainer* container) return; } - TaskContainer::List::iterator it = containers.find(container); + TaskContainer::List::iterator it = containers.tqfind(container); if (it != containers.end()) { containers.erase(it); @@ -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; @@ -701,7 +701,7 @@ void TaskBar::reLayout() fm.height() : TaskBarSettings::minimumButtonHeight(); // horizontal layout - if (orientation() == Horizontal) + if (orientation() == Qt::Horizontal) { int bwidth = BUTTON_MIN_WIDTH; int rows = contentsRect().height() / minButtonHeight; @@ -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); } @@ -846,7 +846,7 @@ void TaskBar::setBackground() } } -void TaskBar::setArrowType(Qt::ArrowType at) +void TaskBar::setArrowType(TQt::ArrowType at) { if (arrowType == at) { @@ -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 ); } } @@ -960,7 +960,7 @@ int TaskBar::maximumButtonsWithoutShrinking() const rows = 1; } - if ( orientation() == Horizontal ) { + if ( orientation() == Qt::Horizontal ) { // maxWidth of 0 means no max width, drop back to default int maxWidth = TaskBarSettings::maximumButtonWidth(); if (maxWidth == 0) diff --git a/kicker/taskbar/taskbar.h b/kicker/taskbar/taskbar.h index ff160bc92..40b02b6ea 100644 --- a/kicker/taskbar/taskbar.h +++ b/kicker/taskbar/taskbar.h @@ -47,11 +47,11 @@ 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 ); + void setArrowType( TQt::ArrowType at ); int containerCount() const; int taskCount() const; diff --git a/kicker/taskbar/taskbarbindings.cpp b/kicker/taskbar/taskbarbindings.cpp index c457d3623..364faac97 100644 --- a/kicker/taskbar/taskbarbindings.cpp +++ b/kicker/taskbar/taskbarbindings.cpp @@ -23,10 +23,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef NOSLOTS # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString::null, key3, key4 ) + keys->insert( name, i18n(name), TQString(), key3, key4 ) #endif #define WIN KKey::QtWIN diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp index 661706bdb..bfd1a40bf 100644 --- a/kicker/taskbar/taskbarcontainer.cpp +++ b/kicker/taskbar/taskbarcontainer.cpp @@ -135,7 +135,7 @@ void TaskBarContainer::configure() windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon, KIcon::Panel, 16)); - windowListButton->setMinimumSize(windowListButton->sizeHint()); + windowListButton->setMinimumSize(windowListButton->tqsizeHint()); layout->insertWidget(0, windowListButton); windowListButton->show(); } @@ -168,7 +168,7 @@ void TaskBarContainer::preferences() void TaskBarContainer::orientationChange(Orientation o) { - if (o == Horizontal) + if (o == Qt::Horizontal) { if (windowListButton) { @@ -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..e0e4f0dce 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: diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index 1e4829a38..345fcb1f9 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/kicker/taskbar/taskcontainer.cpp @@ -62,7 +62,7 @@ TaskContainer::TaskContainer(Task::Ptr task, TaskBar* bar, lastActivated(0), m_menu(0), m_startup(0), - arrowType(Qt::UpArrow), + arrowType(TQt::UpArrow), taskBar(bar), discardNextMouseEvent(false), aboutToActivate(false), @@ -94,7 +94,7 @@ TaskContainer::TaskContainer(Startup::Ptr startup, PixmapList& startupFrames, lastActivated(0), m_menu(0), m_startup(startup), - arrowType(Qt::LeftArrow), + arrowType(TQt::LeftArrow), taskBar(bar), discardNextMouseEvent(false), aboutToActivate(false), @@ -167,7 +167,7 @@ void TaskContainer::taskChanged(bool geometryOnlyChange) return; } - const TQObject* source = sender(); + const TQObject* source = TQT_TQOBJECT_CONST(sender()); Task::Ptr task = 0; Task::List::const_iterator itEnd = tasks.constEnd(); for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it) @@ -190,7 +190,7 @@ void TaskContainer::taskChanged(bool geometryOnlyChange) void TaskContainer::iconChanged() { - const TQObject* source = sender(); + const TQObject* source = TQT_TQOBJECT_CONST(sender()); Task::Ptr task = 0; Task::List::const_iterator itEnd = tasks.constEnd(); for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it) @@ -314,8 +314,8 @@ TQSizePolicy TaskContainer::sizePolicy() const 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 ); + TQRect br( tqstyle().subRect( TQStyle::SR_PushButtonContents, 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) @@ -477,7 +477,7 @@ void TaskContainer::paintEvent( TQPaintEvent* ) } TQPainter p; - p.begin(pm ,this); + p.tqbegin(pm ,this); drawButton(&p); p.end(); @@ -530,7 +530,7 @@ void TaskContainer::drawButton(TQPainter *p) font.setBold(active); - TQColorGroup colors = palette().active(); + TQColorGroup colors = tqpalette().active(); if (TaskBarSettings::useCustomColors()) { @@ -579,14 +579,14 @@ 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)); + TQRect br(tqstyle().subRect(TQStyle::SR_PushButtonContents, this)); + TQPoint shift = TQPoint(tqstyle().tqpixelMetric(TQStyle::PM_ButtonShiftHorizontal), + tqstyle().tqpixelMetric(TQStyle::PM_ButtonShiftVertical)); // draw button background if (drawButton) { - style().drawPrimitive(TQStyle::PE_HeaderSection, p, + tqstyle().tqdrawPrimitive(TQStyle::PE_HeaderSection, p, TQRect(0, 0, width(), height()), colors); } @@ -631,7 +631,7 @@ void TaskContainer::drawButton(TQPainter *p) // modified overlay static TQString modStr = "[" + i18n( "modified" ) + "]"; - int modStrPos = text.find( modStr ); + int modStrPos = text.tqfind( modStr ); int textPos = ( taskBar->showIcon() && (!pixmap.isNull() || m_startup)) ? 2 + 16 + 2 : 0; if (modStrPos >= 0) @@ -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,19 +772,19 @@ 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) { flags |= TQStyle::Style_Down; } - style().drawPrimitive(e, p, ar, colors, flags); + tqstyle().tqdrawPrimitive(e, p, ar, colors, flags); } // 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) { @@ -815,13 +815,13 @@ TQString TaskContainer::name() // in common, and then use everything UP TO that as the name in the button while (i < maxLength) { - TQChar check = match.at(i).lower(); + TQChar check = match.tqat(i).lower(); Task::List::iterator itEnd = m_filteredTasks.end(); for (Task::List::iterator it = m_filteredTasks.begin(); it != itEnd; ++it) { // we're doing a lot of Utf8 -> TQString conversions here // by repeatedly calling visibleIconicName() =/ - if (check != (*it)->visibleName().at(i).lower()) + if (check != (*it)->visibleName().tqat(i).lower()) { if (i > 0) { @@ -886,7 +886,7 @@ void TaskContainer::mousePressEvent( TQMouseEvent* e ) return; } - if (e->button() == LeftButton) + if (e->button() == Qt::LeftButton) { m_dragStartPos = e->pos(); } @@ -901,13 +901,13 @@ void TaskContainer::mousePressEvent( TQMouseEvent* e ) // Other actions will be handled in mouseReleaseEvent switch (e->button()) { - case LeftButton: + case Qt::LeftButton: buttonAction = TaskBarSettings::action(TaskBarSettings::LeftButton); break; - case MidButton: + case Qt::MidButton: buttonAction = TaskBarSettings::action(TaskBarSettings::MiddleButton); break; - case RightButton: + case Qt::RightButton: default: buttonAction = TaskBarSettings::action(TaskBarSettings::RightButton); break; @@ -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 (!TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos())) { TQToolButton::mouseReleaseEvent(e); return; @@ -942,13 +942,13 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e) switch (e->button()) { - case LeftButton: + case Qt::LeftButton: buttonAction = TaskBarSettings::action(TaskBarSettings::LeftButton); break; - case MidButton: + case Qt::MidButton: buttonAction = TaskBarSettings::action(TaskBarSettings::MiddleButton); break; - case RightButton: + case Qt::RightButton: default: buttonAction = TaskBarSettings::action(TaskBarSettings::RightButton); break; @@ -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; @@ -1228,7 +1228,7 @@ bool TaskContainer::eventFilter(TQObject *o, TQEvent *e) if ( TQApplication::widgetAt( p, true ) == this ) { if (me->type() == TQEvent::MouseButtonPress && - me->button() == LeftButton) + me->button() == Qt::LeftButton) { m_dragStartPos = mapFromGlobal(p); } @@ -1246,10 +1246,10 @@ bool TaskContainer::eventFilter(TQObject *o, TQEvent *e) { if (!m_dragStartPos.isNull()) { - TQMouseEvent* me = static_cast<TQMouseEvent*>(e); + TQMouseEvent* me = TQT_TQMOUSEEVENT(e); TQPoint p(me->globalPos()); - if (me->state() & LeftButton && + if (me->state() & Qt::LeftButton && TQApplication::widgetAt(p, true) == this) { kdDebug() << "event move" << endl; @@ -1274,7 +1274,7 @@ bool TaskContainer::eventFilter(TQObject *o, TQEvent *e) return TQToolButton::eventFilter( o, e ); } -void TaskContainer::setArrowType( Qt::ArrowType at ) +void TaskContainer::setArrowType( TQt::ArrowType at ) { if (arrowType == at) { @@ -1611,7 +1611,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) details.append(i18n("Has unsaved changes")); static TQString modStr = "[" + i18n( "modified" ) + "]"; - int modStrPos = name.find(modStr); + int modStrPos = name.tqfind(modStr); if (modStrPos >= 0) { diff --git a/kicker/taskbar/taskcontainer.h b/kicker/taskbar/taskcontainer.h index 567a74a79..4d2e0de9b 100644 --- a/kicker/taskbar/taskcontainer.h +++ b/kicker/taskbar/taskcontainer.h @@ -49,7 +49,7 @@ public: TQWidget *parent = 0, const char *name = 0); virtual ~TaskContainer(); - void setArrowType( Qt::ArrowType at ); + void setArrowType( TQt::ArrowType at ); void init(); @@ -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(); diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp index 864d10f5d..837a7fcec 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(), @@ -229,7 +229,7 @@ void TaskLMBMenu::dragSwitch() void TaskLMBMenu::mousePressEvent( TQMouseEvent* e ) { - if (e->button() == LeftButton) + if (e->button() == Qt::LeftButton) { m_dragStartPos = e->pos(); } diff --git a/kicker/taskmanager/tasklmbmenu.h b/kicker/taskmanager/tasklmbmenu.h index d11091d82..973cf666f 100644 --- a/kicker/taskmanager/tasklmbmenu.h +++ b/kicker/taskmanager/tasklmbmenu.h @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "taskmanager.h" -class TaskMenuItem : public QCustomMenuItem +class TaskMenuItem : public TQCustomMenuItem { public: TaskMenuItem(const TQString &text, @@ -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: @@ -51,7 +51,7 @@ private: /*****************************************************************************/ -class KDE_EXPORT TaskLMBMenu : public QPopupMenu +class KDE_EXPORT TaskLMBMenu : public TQPopupMenu { Q_OBJECT diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp index 739c626b5..103205042 100644 --- a/kicker/taskmanager/taskmanager.cpp +++ b/kicker/taskmanager/taskmanager.cpp @@ -247,9 +247,9 @@ Task::Ptr TaskManager::findTask(int desktop, const TQPoint& p) continue; } - if (t->geometry().contains(p)) + if (t->geometry().tqcontains(p)) { - int index = list.findIndex(t->window()); + int index = list.tqfindIndex(t->window()); if (index > currentIndex) { currentIndex = index; @@ -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 @@ -807,7 +807,7 @@ bool Task::isModified() const static TQString modStr = TQString::fromUtf8("[") + i18n("modified") + TQString::fromUtf8("]"); - int modStrPos = _info.visibleName().find(modStr); + int modStrPos = _info.visibleName().tqfind(modStr); return ( modStrPos != -1 ); } @@ -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; @@ -1305,7 +1305,7 @@ void Task::updateThumbnail() // by the thumbnail generation. This makes things much smoother // on slower machines. // - TQWidget *rootWin = qApp->desktop(); + TQWidget *rootWin = TQT_TQWIDGET(tqApp->desktop()); TQRect geom = _info.geometry(); _grab = TQPixmap::grabWindow(rootWin->winId(), geom.x(), geom.y(), @@ -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); @@ -1375,7 +1375,7 @@ TQPixmap Task::thumbnail(int maxDimension) int thumbnailHeight = (int)(winAttr.height * factor); TQPixmap thumbnail(thumbnailWidth, thumbnailHeight); - thumbnail.fill(TQApplication::palette().active().background()); + thumbnail.fill(TQApplication::tqpalette().active().background()); #if 0 // TQImage::smoothScale() scaling TQPixmap full(winAttr.width, winAttr.height); @@ -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..a12a062d1 100644 --- a/kicker/taskmanager/taskmanager.h +++ b/kicker/taskmanager/taskmanager.h @@ -282,7 +282,7 @@ public: //* @internal void removeTransient( WId w ); //* @internal - bool hasTransient(WId w) const { return _transients.find(w) != _transients.end(); } + bool hasTransient(WId w) const { return _transients.tqfind(w) != _transients.end(); } //* @internal void updateDemandsAttentionState( WId w ); //* @internal @@ -483,7 +483,7 @@ private: /** * Provids a drag object for tasks across desktops. */ -class KDE_EXPORT TaskDrag : public QStoredDrag +class KDE_EXPORT TaskDrag : public TQStoredDrag { public: /** @@ -565,7 +565,7 @@ private: * @see Startup * @see KWinModule */ -class KDE_EXPORT TaskManager : public QObject +class KDE_EXPORT TaskManager : public TQObject { Q_OBJECT Q_PROPERTY( int currentDesktop READ currentDesktop ) 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 ); } diff --git a/kicker/taskmanager/taskrmbmenu.h b/kicker/taskmanager/taskrmbmenu.h index 6657bf909..d95230f9b 100644 --- a/kicker/taskmanager/taskrmbmenu.h +++ b/kicker/taskmanager/taskrmbmenu.h @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqpopupmenu.h> -class KDE_EXPORT TaskRMBMenu : public QPopupMenu +class KDE_EXPORT TaskRMBMenu : public TQPopupMenu { Q_OBJECT |