diff options
Diffstat (limited to 'kicker')
127 files changed, 620 insertions, 620 deletions
diff --git a/kicker/applets/clock/analog.ui b/kicker/applets/clock/analog.ui index 024caaefe..ea0135ceb 100644 --- a/kicker/applets/clock/analog.ui +++ b/kicker/applets/clock/analog.ui @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -241,7 +241,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>310</width> <height>20</height> @@ -269,7 +269,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>50</height> diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index ba5f7eb26..74e6a6c99 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqpainter.h> #include <tqtimer.h> #include <tqtooltip.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <tqtabwidget.h> #include <tqwidgetstack.h> #include <tqcombobox.h> @@ -86,23 +86,23 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent, settings = new SettingsWidgetImp(prefs, zone, 0, "General"); 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(TQT_TQOBJECT(settings->kcfg_PlainShowDate), TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); @@ -123,7 +123,7 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent, 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() @@ -242,7 +242,7 @@ void PlainClock::updateClock() void PlainClock::loadSettings() { setFrameStyle(_prefs->plainShowFrame() ? Panel | Sunken : NoFrame); - setAlignment(AlignVCenter | AlignHCenter | SingleLine); + tqsetAlignment(AlignVCenter | AlignHCenter | SingleLine); setFont(_prefs->plainFont()); } @@ -353,9 +353,9 @@ void DigitalClock::updateClock() if (_force || newStr != _timeStr) { _timeStr = newStr; - setUpdatesEnabled( FALSE ); + tqsetUpdatesEnabled( FALSE ); display(_timeStr); - setUpdatesEnabled( TRUE ); + tqsetUpdatesEnabled( TRUE ); update(); } @@ -386,7 +386,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()); } @@ -415,7 +415,7 @@ void DigitalClock::paintEvent(TQPaintEvent*) // but other colors would break the lcd-lock anyway void DigitalClock::drawContents( TQPainter * p) { - setUpdatesEnabled( FALSE ); + tqsetUpdatesEnabled( FALSE ); TQPalette pal = palette(); if (_prefs->digitalLCDStyle()) pal.setColor( TQColorGroup::Foreground, TQColor(128,128,128)); @@ -430,7 +430,7 @@ void DigitalClock::drawContents( TQPainter * p) pal.setColor( TQColorGroup::Foreground, _prefs->digitalForegroundColor()); setPalette( pal ); p->translate( -2, -2 ); - setUpdatesEnabled( TRUE ); + tqsetUpdatesEnabled( TRUE ); TQLCDNumber::drawContents( p ); p->translate( +1, +1 ); } @@ -553,7 +553,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()); } @@ -827,7 +827,7 @@ void FuzzyClock::drawContents(TQPainter *p) } if (phStart >= 0) newTimeStr.replace(phStart, phLength, hourNames[realHour]); - newTimeStr.replace(0, 1, TQString(newTimeStr.at(0).upper())); + newTimeStr.replace(0, 1, TQString(newTimeStr.tqat(0).upper())); } } else if (_prefs->fuzzyness() == 3) { newTimeStr = dayTime[_time.hour() / 3]; @@ -908,12 +908,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 @@ -980,18 +980,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(); } } @@ -1007,8 +1007,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) { @@ -1020,7 +1020,7 @@ int ClockApplet::widthForHeight(int h) const // if the date format STARTS with a year, assume it's in descending // order and should therefore PRECEED the date. TQString dateFormat = KGlobal::locale()->dateFormatShort(); - dateFirst = dateFormat.at(1) == 'y' || dateFormat.at(1) == 'Y'; + dateFirst = dateFormat.tqat(1) == 'y' || dateFormat.tqat(1) == 'Y'; } if (dateFirst) @@ -1064,13 +1064,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); } } @@ -1094,16 +1094,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(); @@ -1116,7 +1116,7 @@ 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 @@ -1127,13 +1127,13 @@ int ClockApplet::heightForWidth(int w) const } } - if (_date->minimumSizeHint().width() > w) + if (_date->tqminimumSizeHint().width() > w) { - _date->setAlignment(AlignVCenter | WordBreak); + _date->tqsetAlignment(AlignVCenter | WordBreak); } else { - _date->setAlignment(AlignVCenter | AlignHCenter | WordBreak); + _date->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak); } _date->setFixedSize(w, _date->heightForWidth(w)); _date->move(0, clockHeight); @@ -1169,7 +1169,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()) @@ -1272,7 +1272,7 @@ void ClockApplet::reconfigure() _clock->widget()->installEventFilter(this); // catch mouse clicks _clock->widget()->show(); - _clock->forceUpdate(); /* force repaint */ + _clock->forceUpdate(); /* force tqrepaint */ if (showDayOfWeek) { @@ -1306,7 +1306,7 @@ void ClockApplet::setTimerTo60() void ClockApplet::setBackground() { - TQColor globalBgroundColor = KApplication::palette().active().background(); + TQColor globalBgroundColor = KApplication::tqpalette().active().background(); TQColor fgColor, bgColor; if (!_clock) @@ -1371,7 +1371,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); @@ -1541,7 +1541,7 @@ void ClockApplet::aboutToShowContextMenu() menu->insertTitle( SmallIcon( "clock" ), i18n( "Clock" ) ); KLocale *loc = KGlobal::locale(); - TQDateTime dt = TQDateTime::currentDateTime(); + TQDateTime dt = TQDateTime::tqcurrentDateTime(); dt = TQT_TQDATETIME_OBJECT(dt.addSecs(TZoffset)); KPopupMenu *copyMenu = new KPopupMenu( menu ); @@ -1605,7 +1605,7 @@ void ClockApplet::slotCopyMenuActivated( int id ) { TQPopupMenu *m = (TQPopupMenu *) sender(); TQString s = m->text(id); - TQApplication::clipboard()->setText(s); + TQApplication::tqclipboard()->setText(s); } TQTime ClockApplet::clockGetTime() @@ -1615,7 +1615,7 @@ TQTime ClockApplet::clockGetTime() TQDate ClockApplet::clockGetDate() { - return TQT_TQDATE_OBJECT(TQDateTime::currentDateTime().addSecs(TZoffset).date()); + return TQT_TQDATE_OBJECT(TQDateTime::tqcurrentDateTime().addSecs(TZoffset).date()); } void ClockApplet::showZone(int z) @@ -1623,7 +1623,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() @@ -1840,7 +1840,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(TQT_TQDATETIME_OBJECT(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/clockapplet.kcfg b/kicker/applets/clock/clockapplet.kcfg index 04beba322..6abd26ceb 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/digital.ui b/kicker/applets/clock/digital.ui index 1450e6f4f..fc2b66cac 100644 --- a/kicker/applets/clock/digital.ui +++ b/kicker/applets/clock/digital.ui @@ -83,7 +83,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -193,7 +193,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>110</width> <height>20</height> @@ -226,7 +226,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kicker/applets/clock/fuzzy.ui b/kicker/applets/clock/fuzzy.ui index 6906808c7..ebe6af9fc 100644 --- a/kicker/applets/clock/fuzzy.ui +++ b/kicker/applets/clock/fuzzy.ui @@ -79,7 +79,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -153,7 +153,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> diff --git a/kicker/applets/clock/init.cpp b/kicker/applets/clock/init.cpp index a5a7cac30..a21a62757 100644 --- a/kicker/applets/clock/init.cpp +++ b/kicker/applets/clock/init.cpp @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqpainter.h> #include <tqtimer.h> #include <tqtooltip.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <tqtabwidget.h> #include <tqwidgetstack.h> #include <tqcombobox.h> diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui index 560ddcc7f..6cf1d30f0 100644 --- a/kicker/applets/clock/settings.ui +++ b/kicker/applets/clock/settings.ui @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -188,7 +188,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -284,7 +284,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>230</width> <height>20</height> @@ -306,7 +306,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -371,7 +371,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>343</width> <height>20</height> @@ -421,7 +421,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>100</height> diff --git a/kicker/applets/launcher/configdlgbase.ui b/kicker/applets/launcher/configdlgbase.ui index edfa6f02f..e551864b1 100644 --- a/kicker/applets/launcher/configdlgbase.ui +++ b/kicker/applets/launcher/configdlgbase.ui @@ -83,7 +83,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>332</width> <height>20</height> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>140</width> <height>20</height> @@ -152,7 +152,7 @@ <property name="text"> <string>Short Term</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -163,7 +163,7 @@ <property name="text"> <string>Long Term</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -192,7 +192,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>50</width> <height>20</height> diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp index 248614811..0c19e5326 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/kicker/applets/launcher/quickbutton.cpp @@ -163,7 +163,7 @@ QuickButton::QuickButton(const TQString &u, KAction* configAction, TQToolTip::add(this, _qurl->name()); resize(int(DEFAULT_ICON_DIM),int(DEFAULT_ICON_DIM)); - TQBrush bgbrush(colorGroup().brush(TQColorGroup::Background)); + TQBrush bgbrush(tqcolorGroup().brush(TQColorGroup::Background)); QuickAddAppsMenu *addAppsMenu = new QuickAddAppsMenu( parent, this, _qurl->url()); diff --git a/kicker/applets/launcher/quickbuttongroup.h b/kicker/applets/launcher/quickbuttongroup.h index 1c153d85c..37d04ef9e 100644 --- a/kicker/applets/launcher/quickbuttongroup.h +++ b/kicker/applets/launcher/quickbuttongroup.h @@ -24,15 +24,15 @@ public: void setDragging(bool drag); void setEnableDrag(bool enable); void deleteContents(); - void setUpdatesEnabled(bool enable); + void tqsetUpdatesEnabled(bool enable); }; QuickButtonGroup::Index QuickButtonGroup::findDescriptor(const TQString &desc) { return findProperty(desc, std::mem_fun(&QuickButton::url));} -inline void QuickButtonGroup::setUpdatesEnabled(bool enable) +inline void QuickButtonGroup::tqsetUpdatesEnabled(bool enable) { for (QuickButtonGroup::iterator i=begin();i!=end();++i) { - (*i)->setUpdatesEnabled(enable); + (*i)->tqsetUpdatesEnabled(enable); if (enable) { (*i)->update();} } } diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp index 30b125726..7ead9eced 100644 --- a/kicker/applets/launcher/quicklauncher.cpp +++ b/kicker/applets/launcher/quicklauncher.cpp @@ -770,8 +770,8 @@ void QuickLauncher::refreshContents() unsigned index; TQPoint pos; - setUpdatesEnabled(false); - m_buttons->setUpdatesEnabled(false); + tqsetUpdatesEnabled(false); + m_buttons->tqsetUpdatesEnabled(false); for (index = 0; index < m_buttons->size(); index++) { pos = m_manager->pos(index); @@ -791,9 +791,9 @@ void QuickLauncher::refreshContents() m_dragButtons->setDragging(true); } m_buttons->show(); - setUpdatesEnabled(true); + tqsetUpdatesEnabled(true); update(); - m_buttons->setUpdatesEnabled(true); + m_buttons->tqsetUpdatesEnabled(true); updateGeometry(); emit updateLayout(); updateStickyHighlightLayer(); @@ -1097,7 +1097,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 98d0e1708..882c8286b 100644 --- a/kicker/applets/lockout/lockout.cpp +++ b/kicker/applets/lockout/lockout.cpp @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <layout.h> +#include <tqlayout.h> #include <tqpainter.h> #include <tqpixmap.h> #include <tqpopupmenu.h> @@ -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,7 +113,7 @@ 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 && @@ -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() @@ -177,9 +177,9 @@ void Lockout::mouseMoveEvent(TQMouseEvent* e) void Lockout::propagateMouseEvent(TQMouseEvent* e) { if ( !isTopLevel() ) { - TQMouseEvent me(e->type(), mapTo( topLevelWidget(), e->pos() ), + TQMouseEvent me(e->type(), mapTo( tqtopLevelWidget(), e->pos() ), e->globalPos(), e->button(), e->state() ); - TQApplication::sendEvent( topLevelWidget(), &me ); + TQApplication::sendEvent( tqtopLevelWidget(), &me ); } } diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp index da2b30564..1e71fbd6f 100644 --- a/kicker/applets/media/mediumbutton.cpp +++ b/kicker/applets/media/mediumbutton.cpp @@ -20,7 +20,7 @@ #include "mediumbutton.h" #include <tqapplication.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <tqpainter.h> #include <tqdrawutil.h> #include <tqpopupmenu.h> @@ -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/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp index df34a78ac..f0a86946f 100644 --- a/kicker/applets/menu/menuapplet.cpp +++ b/kicker/applets/menu/menuapplet.cpp @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "menuapplet.h" -#include <layout.h> +#include <tqlayout.h> #include <tqtooltip.h> #include <tqvariant.h> // avoid X11 #define's @@ -264,7 +264,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 diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp index 3bb7f65d4..a684aa6f8 100644 --- a/kicker/applets/minipager/pagerapplet.cpp +++ b/kicker/applets/minipager/pagerapplet.cpp @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqtooltip.h> #include <tqlineedit.h> #include <tqpopupmenu.h> -#include <layout.h> +#include <tqlayout.h> #include <tqbuttongroup.h> #include <dcopref.h> @@ -365,7 +365,7 @@ 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(), + m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).tqarg( screen ).latin1(), screen, TQT_TQOBJECT(this) ); if( !m_desktopLayoutOwner->claim( false )) { @@ -865,7 +865,7 @@ void KMiniPager::slotDesktopNamesChanged() { TQString name = m_twin->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 1dfa5ee25..e494d538d 100644 --- a/kicker/applets/minipager/pagerbutton.cpp +++ b/kicker/applets/minipager/pagerbutton.cpp @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqlineedit.h> #include <tqpainter.h> #include <tqpopupmenu.h> -#include <stylesheet.h> +#include <tqstylesheet.h> #include <netwm.h> #include <dcopclient.h> @@ -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().contains(r.topLeft()) && + !TQApplication::desktop()->tqgeometry().contains(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 = TQBrush(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 (twin->activeWindow() == info->win()) { - TQBrush brush = colorGroup().brush(TQColorGroup::Highlight); - qDrawShadeRect(bp, r, colorGroup(), false, 1, 0, &brush); + TQBrush brush = tqcolorGroup().brush(TQColorGroup::Highlight); + qDrawShadeRect(bp, r, tqcolorGroup(), false, 1, 0, &brush); } else { - TQBrush brush = colorGroup().brush(TQColorGroup::Button); + TQBrush brush = tqcolorGroup().brush(TQColorGroup::Button); if (on) { @@ -475,7 +475,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp) } bp->fillRect(r, brush); - qDrawShadeRect(bp, r, colorGroup(), true, 1, 0); + qDrawShadeRect(bp, r, tqcolorGroup(), true, 1, 0); } if (m_pager->windowIcons() && r.width() > 15 && r.height() > 15) @@ -498,11 +498,11 @@ void KMiniPagerButton::drawButton(TQPainter *bp) // makes it look a bit more finished. if (on) { - bp->setPen(colorGroup().midlight()); + bp->setPen(tqcolorGroup().midlight()); } else { - bp->setPen(colorGroup().mid()); + bp->setPen(tqcolorGroup().mid()); } bp->drawRect(0, 0, w, h); @@ -515,7 +515,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp) if (transparent || liveBkgnd) { - bp->setPen(on ? colorGroup().midlight() : colorGroup().buttonText()); + bp->setPen(on ? tqcolorGroup().midlight() : tqcolorGroup().buttonText()); m_pager->shadowEngine()->drawText(*bp, TQRect(0, 0, w, h), AlignCenter, label, size()); } else @@ -523,7 +523,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp) } if (m_inside) - KickerLib::drawBlendedRect(bp, TQRect(1, 1, width() - 2, height() - 2), colorGroup().foreground()); + KickerLib::drawBlendedRect(bp, TQRect(1, 1, width() - 2, height() - 2), tqcolorGroup().foreground()); } void KMiniPagerButton::mousePressEvent(TQMouseEvent * e) @@ -586,9 +586,9 @@ void KMiniPagerButton::mouseMoveEvent(TQMouseEvent* e) TQPixmap windowImage(ww, wh); TQPainter bp(&windowImage, this); - bp.setPen(colorGroup().foreground()); + bp.setPen(tqcolorGroup().foreground()); bp.drawRect(0, 0, ww, wh); - bp.fillRect(1, 1, ww - 2, wh - 2, colorGroup().background()); + bp.fillRect(1, 1, ww - 2, wh - 2, tqcolorGroup().background()); Task::List tasklist; tasklist.append(m_currentWindow); diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp index bf1d96232..953bcacbd 100644 --- a/kicker/applets/naughty/NaughtyApplet.cpp +++ b/kicker/applets/naughty/NaughtyApplet.cpp @@ -24,7 +24,7 @@ #include <tqmessagebox.h> #include <tqtoolbutton.h> -#include <layout.h> +#include <tqlayout.h> #include <kiconloader.h> #include <kglobal.h> diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.cpp b/kicker/applets/naughty/NaughtyProcessMonitor.cpp index 4bff5f851..aaca4213e 100644 --- a/kicker/applets/naughty/NaughtyProcessMonitor.cpp +++ b/kicker/applets/naughty/NaughtyProcessMonitor.cpp @@ -36,7 +36,7 @@ #include <tqfile.h> #include <tqstring.h> #include <tqstringlist.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqdir.h> #include <tqtimer.h> #include <tqmap.h> @@ -255,7 +255,7 @@ NaughtyProcessMonitor::processName(ulong pid) const } // Now strip 'tdeinit:' prefix. - TQString unicode(TQString::fromLocal8Bit(s)); + TQString tqunicode(TQString::fromLocal8Bit(s)); #elif defined(__OpenBSD__) int mib[4] ; @@ -280,12 +280,12 @@ NaughtyProcessMonitor::processName(ulong pid) const } // Now strip 'tdeinit:' 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] == "tdeinit:" ? parts[1] : parts[0]; diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp index fb7ac107b..8f441a397 100644 --- a/kicker/applets/run/runapplet.cpp +++ b/kicker/applets/run/runapplet.cpp @@ -121,14 +121,14 @@ void RunApplet::resizeEvent(TQResizeEvent*) _input->reparent(this, TQPoint(0,0), true); _label->setGeometry(0,0, width(), _label->height()); - if(height() >= _input->sizeHint().height() + _label->height()) + if(height() >= _input->tqsizeHint().height() + _label->height()) { - int inputVOffset = height() - _input->sizeHint().height() - 2; - int labelHeight = _label->sizeHint().height(); + int inputVOffset = height() - _input->tqsizeHint().height() - 2; + int labelHeight = _label->tqsizeHint().height(); _label->setGeometry(0, inputVOffset - labelHeight, width(), labelHeight); _input->setGeometry(0, inputVOffset, - width(), _input->sizeHint().height()); + width(), _input->tqsizeHint().height()); _label->show(); } else @@ -138,7 +138,7 @@ void RunApplet::resizeEvent(TQResizeEvent*) // make it as high as the combobox naturally wants to be // but no taller than the panel is! // don't forget to center it vertically either. - int newHeight = _input->sizeHint().height(); + int newHeight = _input->tqsizeHint().height(); if (newHeight > height()) newHeight = height(); _input->setGeometry(0, (height() - newHeight) / 2, @@ -184,7 +184,7 @@ void RunApplet::setButtonText() int RunApplet::widthForHeight(int ) const { - return _label->sizeHint().width(); + return _label->tqsizeHint().width(); } int RunApplet::heightForWidth(int ) const diff --git a/kicker/applets/swallow/prefwidgetbase.ui b/kicker/applets/swallow/prefwidgetbase.ui index bd2673efa..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 f171b1099..03be831e3 100644 --- a/kicker/applets/swallow/swallow.cpp +++ b/kicker/applets/swallow/swallow.cpp @@ -20,7 +20,7 @@ #include <stdlib.h> -#include <layout.h> +#include <tqlayout.h> #include <tqstringlist.h> #include <kapplication.h> diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 3303135b3..570db2f92 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -388,7 +388,7 @@ void SystemTrayApplet::checkAutoRetract() return; } - if (!geometry().contains(mapFromGlobal(TQCursor::pos()))) + if (!tqgeometry().contains(mapFromGlobal(TQCursor::pos()))) { m_autoRetractTimer->stop(); if (m_autoRetract) @@ -427,12 +427,12 @@ void SystemTrayApplet::showExpandButton(bool show) 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); } @@ -869,7 +869,7 @@ int SystemTrayApplet::widthForHeight(int h) const me->setFixedHeight(h); } - return sizeHint().width(); + return tqsizeHint().width(); } int SystemTrayApplet::heightForWidth(int w) const @@ -888,7 +888,7 @@ int SystemTrayApplet::heightForWidth(int w) const me->setFixedWidth(w); } - return sizeHint().height(); + return tqsizeHint().height(); } void SystemTrayApplet::moveEvent( TQMoveEvent* ) @@ -906,7 +906,7 @@ void SystemTrayApplet::resizeEvent( TQResizeEvent* ) void SystemTrayApplet::layoutTray() { - setUpdatesEnabled(false); + tqsetUpdatesEnabled(false); int iconCount = m_shownWins.count(); @@ -927,11 +927,11 @@ void SystemTrayApplet::layoutTray() { 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); } } @@ -1102,7 +1102,7 @@ void SystemTrayApplet::layoutTray() } } - setUpdatesEnabled(true); + tqsetUpdatesEnabled(true); updateGeometry(); setBackground(); @@ -1138,7 +1138,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(); diff --git a/kicker/applets/systemtray/systemtrayapplet.h b/kicker/applets/systemtray/systemtrayapplet.h index 237921884..92aab7268 100644 --- a/kicker/applets/systemtray/systemtrayapplet.h +++ b/kicker/applets/systemtray/systemtrayapplet.h @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqvaluevector.h> #include <tqstringlist.h> #include <tqevent.h> -#include <layout.h> +#include <tqlayout.h> #include <tqcheckbox.h> #include <qxembed.h> diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp index f52fdc059..ebeec601f 100644 --- a/kicker/applets/taskbar/taskbarapplet.cpp +++ b/kicker/applets/taskbar/taskbarapplet.cpp @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <layout.h> -#include <palette.h> +#include <tqlayout.h> +#include <tqpalette.h> #include <kapplication.h> #include <kglobal.h> @@ -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/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index 2a4944c20..da20a2a61 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/kicker/extensions/dockbar/dockbarextension.cpp @@ -60,7 +60,7 @@ DockBarExtension::DockBarExtension(const TQString& configFile, Type type, twin_module = new KWinModule(TQT_TQOBJECT(this)); connect( twin_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()); @@ -335,7 +335,7 @@ int DockBarExtension::findContainerAtPoint(const TQPoint& p) it != containers.constEnd(); ++it, ++i) { - if ((*it)->geometry().contains(p)) + if ((*it)->tqgeometry().contains(p)) { return i; } @@ -350,7 +350,7 @@ void DockBarExtension::mousePressEvent(TQMouseEvent *e ) { mclic_pos = e->pos(); } else if (e->button() == Qt::RightButton) { int pos = findContainerAtPoint(e->pos()); - if (pos != -1) containers.at(pos)->popupMenu(e->globalPos()); + if (pos != -1) containers.tqat(pos)->popupMenu(e->globalPos()); } } @@ -374,7 +374,7 @@ void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) { int pos = findContainerAtPoint(e->pos()); original_container = 0; if (pos > -1) { - original_container = containers.at(pos); + original_container = containers.tqat(pos); mclic_dock_pos = e->pos() - original_container->pos(); dragged_container_original_pos = pos; dragging_container = new DockContainer(original_container->command(), 0, original_container->resName(), original_container->resClass(), true); diff --git a/kicker/extensions/dockbar/dockbarextension.h b/kicker/extensions/dockbar/dockbarextension.h index 0952d259e..4a5dff41f 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/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp index f0daf7655..35028d9e0 100644 --- a/kicker/extensions/kasbar/kasaboutdlg.cpp +++ b/kicker/extensions/kasbar/kasaboutdlg.cpp @@ -57,7 +57,7 @@ #include <tqvbox.h> #include <tqlabel.h> #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tdeversion.h> #include <klocale.h> diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp index 89fcad751..3d63c8c4e 100644 --- a/kicker/extensions/kasbar/kasbar.cpp +++ b/kicker/extensions/kasbar/kasbar.cpp @@ -93,7 +93,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f ) rootPix( 0 ), enableTint_( false ), tintAmount_( 0.1 ), - tintColour_( colorGroup().mid() ), + tintColour_( tqcolorGroup().mid() ), useMask_( true ), res(0) { @@ -102,7 +102,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f ) setMouseTracking( true ); setMaxBoxes( 0 ); - connect( this, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) ); + connect( this, TQT_SIGNAL( configChanged() ), TQT_SLOT( tqrepaint() ) ); } KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *name, WFlags f ) @@ -122,7 +122,7 @@ KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *nam rootPix( 0 ), enableTint_( false ), tintAmount_( 0.1 ), - tintColour_( colorGroup().mid() ), + tintColour_( tqcolorGroup().mid() ), useMask_( true ), res(0) { @@ -130,7 +130,7 @@ KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *nam items.setAutoDelete( true ); setMouseTracking( true ); setMaxBoxes( 0 ); - connect( master_, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) ); + connect( master_, TQT_SIGNAL( configChanged() ), TQT_SLOT( tqrepaint() ) ); } KasBar::~KasBar() @@ -255,7 +255,7 @@ void KasBar::setTint( bool enable ) } emit configChanged(); - repaint( true ); + tqrepaint( true ); } } @@ -269,7 +269,7 @@ void KasBar::setTint( double amount, TQColor color ) emit configChanged(); if ( rootPix->isAvailable() ) - rootPix->repaint( true ); + rootPix->tqrepaint( true ); } } @@ -375,7 +375,7 @@ void KasBar::setDetached( bool detach ) emit detachedChanged( detached ); } -TQSize KasBar::sizeHint( Orientation o, TQSize sz ) +TQSize KasBar::tqsizeHint( Orientation o, TQSize sz ) { if ( o == Qt::Horizontal ) setBoxesPerLine( sz.width() / itemExtent() ); @@ -414,7 +414,7 @@ void KasBar::updateLayout() if ( !isUpdatesEnabled() ) return; bool updates = isUpdatesEnabled(); - setUpdatesEnabled( false ); + tqsetUpdatesEnabled( false ); // This is for testing a rectangular layout // boxesPerLine_ = (uint) ceil(sqrt( items.count() )); @@ -443,32 +443,32 @@ void KasBar::updateLayout() resize( sz ); } - setUpdatesEnabled( updates ); + tqsetUpdatesEnabled( updates ); - TQWidget *top = topLevelWidget(); + TQWidget *top = tqtopLevelWidget(); TQRegion mask; KasItem *i; if ( orient == Qt::Horizontal ) { for ( i = items.first(); i; i = items.next() ) { - int x = (items.at() % c) * itemExtent(); + int x = (items.tqat() % c) * itemExtent(); if ( direction_ == TQBoxLayout::RightToLeft ) x = width() - x - itemExtent(); - i->setPos( x, (items.at() / c) * itemExtent() ); + i->setPos( x, (items.tqat() / c) * itemExtent() ); i->update(); mask = mask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) ); } } else { for ( i = items.first(); i; i = items.next() ) { - int y = (items.at() / r) * itemExtent(); + int y = (items.tqat() / r) * itemExtent(); if ( direction_ == TQBoxLayout::BottomToTop ) y = height() - y - itemExtent(); - i->setPos( (items.at() % r) * itemExtent(), y ); + i->setPos( (items.tqat() % r) * itemExtent(), y ); i->update(); mask = mask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) ); } @@ -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) diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h index d16eb44bf..201fcc882 100644 --- a/kicker/extensions/kasbar/kasbar.h +++ b/kicker/extensions/kasbar/kasbar.h @@ -62,7 +62,7 @@ #include <tqwidget.h> #include <tqpoint.h> #include <tqptrlist.h> -#include <layout.h> +#include <tqlayout.h> #include "kasresources.h" @@ -120,7 +120,7 @@ public: void remove( KasItem *i ); void clear(); KasItem *take( KasItem *i ) { return items.take( indexOf(i) ); } - KasItem *itemAt( uint i ) { return items.at( i ); } + KasItem *itemAt( uint i ) { return items.tqat( i ); } int indexOf( KasItem *i ) { return items.find( i ); } KasItemList *itemList() { return &items; } @@ -152,7 +152,7 @@ public: bool isDrag() const { return inDrag; } - TQSize sizeHint( Qt::Orientation, TQSize max ); + TQSize tqsizeHint( Qt::Orientation, TQSize max ); // // Look and feel options diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp index 385a79131..c63d6e277 100644 --- a/kicker/extensions/kasbar/kasbarextension.cpp +++ b/kicker/extensions/kasbar/kasbarextension.cpp @@ -51,7 +51,7 @@ /* ** Bug reports and questions can be sent to [email protected] */ -#include <layout.h> +#include <tqlayout.h> #include <dcopclient.h> #include <kapplication.h> @@ -141,7 +141,7 @@ void KasBarExtension::showEvent( TQShowEvent */*se*/ ) { updateGeometry(); resize( kasbar->size() ); - repaint( true ); + tqrepaint( true ); } TQSize KasBarExtension::detachedSize() @@ -153,7 +153,7 @@ TQSize KasBarExtension::detachedSize() } -TQSize KasBarExtension::sizeHint(Position p, TQSize maxSize ) const +TQSize KasBarExtension::tqsizeHint(Position p, TQSize maxSize ) const { Orientation o = Qt::Horizontal; @@ -167,7 +167,7 @@ TQSize KasBarExtension::sizeHint(Position p, TQSize maxSize ) const return TQSize( 0, kasbar->itemExtent()/2 ); } - return kasbar->sizeHint( o, maxSize ); + return kasbar->tqsizeHint( o, maxSize ); } void KasBarExtension::positionChange( Position /* position */) diff --git a/kicker/extensions/kasbar/kasbarextension.h b/kicker/extensions/kasbar/kasbarextension.h index 7fbb4fbc6..e5e3142df 100644 --- a/kicker/extensions/kasbar/kasbarextension.h +++ b/kicker/extensions/kasbar/kasbarextension.h @@ -76,7 +76,7 @@ public: virtual ~KasBarExtension(); - TQSize sizeHint( Position, TQSize maxSize ) const; + TQSize tqsizeHint( Position, TQSize maxSize ) const; Position preferedPosition() const { return Right; } virtual void positionChange( Position position ); diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp index 51dac687d..959734c22 100644 --- a/kicker/extensions/kasbar/kasclockitem.cpp +++ b/kicker/extensions/kasbar/kasclockitem.cpp @@ -45,7 +45,7 @@ KasClockItem::KasClockItem( KasBar *parent ) lcd = new LCD( parent ); lcd->hide(); - lcd->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); + lcd->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); lcd->setBackgroundMode( NoBackground ); lcd->setFrameStyle( TQFrame::NoFrame ); lcd->setSegmentStyle( TQLCDNumber::Flat ); @@ -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 7e23ce7fd..31615acbf 100644 --- a/kicker/extensions/kasbar/kasgroupitem.cpp +++ b/kicker/extensions/kasbar/kasgroupitem.cpp @@ -213,7 +213,7 @@ void KasGroupItem::paint( TQPainter *p ) int ypos = 16; for ( int i = 0; ( i < (int) items.count() ) && ( i < microsPerCol ); i++ ) { - Task::Ptr t = items.at( i ); + Task::Ptr t = items.tqat( i ); if( t->isIconified() ) p->drawPixmap( xpos, ypos, res->microMinIcon() ); diff --git a/kicker/extensions/kasbar/kasgroupitem.h b/kicker/extensions/kasbar/kasgroupitem.h index e30260f57..ec6f07493 100644 --- a/kicker/extensions/kasbar/kasgroupitem.h +++ b/kicker/extensions/kasbar/kasgroupitem.h @@ -91,7 +91,7 @@ public: KasTasker *kasbar() const; - Task::Ptr task( uint i ) { return items.at( i ); } + Task::Ptr task( uint i ) { return items.tqat( i ); } int taskCount() const { return items.count(); } TQPixmap icon(); diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp index 323148713..d8bd83b54 100644 --- a/kicker/extensions/kasbar/kasitem.cpp +++ b/kicker/extensions/kasbar/kasitem.cpp @@ -301,7 +301,7 @@ void KasItem::paintFrame( TQPainter *p ) if ( !frame ) return; - qDrawShadePanel(p, 0, 0, extent(), extent(), colorGroup(), false, 2); + qDrawShadePanel(p, 0, 0, extent(), extent(), tqcolorGroup(), false, 2); TQPen pen; @@ -547,12 +547,12 @@ 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 ); diff --git a/kicker/extensions/kasbar/kasitem.h b/kicker/extensions/kasbar/kasitem.h index 5c7378825..66cecf9ac 100644 --- a/kicker/extensions/kasbar/kasitem.h +++ b/kicker/extensions/kasbar/kasitem.h @@ -171,8 +171,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 ); @@ -218,7 +218,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 6fa1f9b2a..459bd6639 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/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 a023bd182..bada9786b 100644 --- a/kicker/extensions/kasbar/kasresources.h +++ b/kicker/extensions/kasbar/kasresources.h @@ -59,7 +59,7 @@ #include <tqbitmap.h> #include <tqcolor.h> -#include <brush.h> +#include <tqbrush.h> #include <tqpen.h> #include <kpixmap.h> diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp index 851b7d915..28be059ae 100644 --- a/kicker/extensions/kasbar/kastasker.cpp +++ b/kicker/extensions/kasbar/kastasker.cpp @@ -315,7 +315,7 @@ void KasTasker::moveToMain( KasGroupItem *gi, Task::Ptr t ) void KasTasker::moveToMain( KasGroupItem *gi ) { bool updates = isUpdatesEnabled(); - setUpdatesEnabled( false ); + tqsetUpdatesEnabled( false ); int i = indexOf( gi ); @@ -327,7 +327,7 @@ void KasTasker::moveToMain( KasGroupItem *gi ) gi->hidePopup(); remove( gi ); - setUpdatesEnabled( updates ); + tqsetUpdatesEnabled( updates ); updateLayout(); } @@ -346,7 +346,7 @@ void KasTasker::removeStartup( Startup::Ptr s ) void KasTasker::refreshAll() { bool updates = isUpdatesEnabled(); - setUpdatesEnabled( false ); + tqsetUpdatesEnabled( false ); clear(); @@ -365,7 +365,7 @@ void KasTasker::refreshAll() addTask( t.data() ); } - setUpdatesEnabled( updates ); + tqsetUpdatesEnabled( updates ); updateLayout(); } @@ -572,7 +572,7 @@ void KasTasker::readConfig( KConfig *conf ) } bool updates = isUpdatesEnabled(); - setUpdatesEnabled( false ); + tqsetUpdatesEnabled( false ); // @@ -653,7 +653,7 @@ void KasTasker::readConfig( KConfig *conf ) // fillActiveBg = conf->readBoolEntry( "FillActiveIconBackground", true ); // enablePopup = conf->readBoolEntry( "EnablePopup", true ); - setUpdatesEnabled( updates ); + tqsetUpdatesEnabled( updates ); emit configChanged(); } diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp index 51fb450a6..cc10b6410 100644 --- a/kicker/extensions/kasbar/kastaskitem.cpp +++ b/kicker/extensions/kasbar/kastaskitem.cpp @@ -56,12 +56,12 @@ #include <tqbitmap.h> #include <tqimage.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqmetaobject.h> #include <tqpainter.h> #include <tqregexp.h> #include <tqtabwidget.h> -#include <textview.h> +#include <tqtextview.h> #include <tqtimer.h> #include <tqvbox.h> @@ -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 ); @@ -173,14 +173,14 @@ void KasTaskItem::updateTask(bool geometryChangeOnly) } bool updates = kasbar()->isUpdatesEnabled(); - kasbar()->setUpdatesEnabled( false ); + kasbar()->tqsetUpdatesEnabled( false ); setProgress( kasbar()->showProgress() ? 0 : -1 ); setText( task_->visibleIconicName() ); setModified( task_->isModified() ); setActive( task_->isActive() ); - kasbar()->setUpdatesEnabled( updates ); + kasbar()->tqsetUpdatesEnabled( updates ); update(); } @@ -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); @@ -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 3485eca21..3e29403f4 100644 --- a/kicker/extensions/sidebar/sidebarextension.cpp +++ b/kicker/extensions/sidebar/sidebarextension.cpp @@ -22,7 +22,7 @@ #include <klocale.h> #include <kparts/part.h> #include <kparts/componentfactory.h> -#include <layout.h> +#include <tqlayout.h> #include <konq_historymgr.h> #include <krun.h> #include <kurl.h> @@ -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 e3269a5d1..56e6ea3ce 100644 --- a/kicker/extensions/taskbar/taskbarextension.cpp +++ b/kicker/extensions/taskbar/taskbarextension.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <layout.h> +#include <tqlayout.h> #include <tqtimer.h> #include <tqwmatrix.h> @@ -123,17 +123,17 @@ void TaskBarExtension::preferences() m_container->preferences(); } -TQSize TaskBarExtension::sizeHint(Position p, TQSize maxSize) const +TQSize TaskBarExtension::tqsizeHint(Position p, TQSize maxSize) const { if (p == Left || p == Right) maxSize.setWidth(sizeInPixels()); else maxSize.setHeight(sizeInPixels()); -// kdDebug(1210) << "TaskBarExtension::sizeHint( Position, TQSize )" << endl; +// kdDebug(1210) << "TaskBarExtension::tqsizeHint( Position, TQSize )" << endl; // kdDebug(1210) << " width: " << size.width() << endl; // kdDebug(1210) << "height: " << size.height() << endl; - return m_container->sizeHint(p, maxSize); + return m_container->tqsizeHint(p, maxSize); } void TaskBarExtension::configure() @@ -155,7 +155,7 @@ void TaskBarExtension::setBackgroundTheme() } else { - m_rootPixmap->repaint(true); + m_rootPixmap->tqrepaint(true); } double tint = double(KickerSettings::tintValue()) / 100; diff --git a/kicker/extensions/taskbar/taskbarextension.h b/kicker/extensions/taskbar/taskbarextension.h index 2848e80c7..92c065beb 100644 --- a/kicker/extensions/taskbar/taskbarextension.h +++ b/kicker/extensions/taskbar/taskbarextension.h @@ -49,7 +49,7 @@ public: int actions = 0, TQWidget *parent = 0, const char *name = 0 ); ~TaskBarExtension(); - TQSize sizeHint( Position, TQSize maxSize ) const; + TQSize tqsizeHint( Position, TQSize maxSize ) const; Position preferedPosition() const { return Bottom; } protected: diff --git a/kicker/kicker/buttons/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 a05027628..2b5153545 100644 --- a/kicker/kicker/buttons/knewbutton.cpp +++ b/kicker/kicker/buttons/knewbutton.cpp @@ -286,7 +286,7 @@ void KNewButton::drawEye() } m_active_pixmap = pixmap.xForm(matrix); - repaint(false); + tqrepaint(false); } #undef eye_x #undef eye_y diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp index 362fbfb1e..382779648 100644 --- a/kicker/kicker/core/applethandle.cpp +++ b/kicker/kicker/core/applethandle.cpp @@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ #include <tqcursor.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpainter.h> #include <tqstyle.h> #include <tqpixmapcache.h> @@ -75,14 +75,14 @@ AppletHandle::AppletHandle(AppletContainer* parent) int AppletHandle::heightForWidth( int /* w */ ) const { - int size = tqstyle().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int size = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); return size; } int AppletHandle::widthForHeight( int /* h */ ) const { - int size = tqstyle().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int size = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); return size; } @@ -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().contains(m_applet->mapToParent( m_applet->mapFromGlobal(TQCursor::pos())))) { return; @@ -282,7 +282,7 @@ void AppletHandle::checkHandleHover() bool AppletHandle::onMenuButton(const TQPoint& point) const { - return m_menuButton && (childAt(mapFromGlobal(point)) == m_menuButton); + return m_menuButton && (tqchildAt(mapFromGlobal(point)) == m_menuButton); } void AppletHandle::toggleMenuButtonOff() @@ -308,9 +308,9 @@ AppletHandleDrag::AppletHandleDrag(AppletHandle* parent) setBackgroundOrigin( AncestorOrigin ); } -TQSize AppletHandleDrag::minimumSizeHint() const +TQSize AppletHandleDrag::tqminimumSizeHint() const { - int wh = tqstyle().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int wh = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); if (m_parent->orientation() == Qt::Horizontal) { @@ -368,7 +368,7 @@ void AppletHandleDrag::paintEvent(TQPaintEvent *) TQRect r = rect(); tqstyle().tqdrawPrimitive(TQStyle::PE_DockWindowHandle, &p, r, - colorGroup(), flags); + tqcolorGroup(), flags); } else { @@ -382,9 +382,9 @@ AppletHandleButton::AppletHandleButton(AppletHandle *parent) { } -TQSize AppletHandleButton::minimumSizeHint() const +TQSize AppletHandleButton::tqminimumSizeHint() const { - int height = tqstyle().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int height = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); int width = height; if (m_parent->orientation() == Qt::Horizontal) diff --git a/kicker/kicker/core/applethandle.h b/kicker/kicker/core/applethandle.h index 34e8e3576..a49319dc6 100644 --- a/kicker/kicker/core/applethandle.h +++ b/kicker/kicker/core/applethandle.h @@ -92,9 +92,9 @@ class AppletHandleDrag : public TQWidget 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 0dbae021e..a6cfc11ab 100644 --- a/kicker/kicker/core/container_applet.cpp +++ b/kicker/kicker/core/container_applet.cpp @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqcursor.h> #include <qxembed.h> #include <tqframe.h> -#include <layout.h> +#include <tqlayout.h> #include <tqhbox.h> #include <tqfile.h> #include <tqtimer.h> @@ -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(); @@ -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); @@ -361,7 +361,7 @@ void AppletContainer::alignmentChange(KPanelExtension::Alignment a) return; } - _applet->setAlignment( (KPanelApplet::Alignment)a ); + _applet->tqsetAlignment( (KPanelApplet::Alignment)a ); } int AppletContainer::widthForHeight(int h) const diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp index 183ceb0f2..2607e3608 100644 --- a/kicker/kicker/core/container_base.cpp +++ b/kicker/kicker/core/container_base.cpp @@ -38,7 +38,7 @@ BaseContainer::BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent, const : TQWidget( parent, name ) , _dir(KPanelApplet::Up) , _orient(Qt::Horizontal) - , _alignment(KPanelExtension::LeftTop) + , _tqalignment(KPanelExtension::LeftTop) , _fspace(0) , _moveOffset(TQPoint(0,0)) , _aid(TQString::null) @@ -110,14 +110,14 @@ 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; + _tqalignment = a; alignmentChange(a); } diff --git a/kicker/kicker/core/container_base.h b/kicker/kicker/core/container_base.h index f1eaddee1..f9c449b1f 100644 --- a/kicker/kicker/core/container_base.h +++ b/kicker/kicker/core/container_base.h @@ -73,7 +73,7 @@ public: KPanelApplet::Direction popupDirection() const { return _dir; } KPanelExtension::Orientation orientation() const { return _orient; } - KPanelExtension::Alignment alignment() const { return _alignment; } + KPanelExtension::Alignment tqalignment() const { return _tqalignment; } virtual void setBackground() {} @@ -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*); @@ -118,7 +118,7 @@ protected: 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 3dab07120..0cd7d6f19 100644 --- a/kicker/kicker/core/container_button.cpp +++ b/kicker/kicker/core/container_button.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <algorithm> -#include <layout.h> +#include <tqlayout.h> #include <kapplication.h> #include <kconfig.h> diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 42b00263e..51a9904d7 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqcursor.h> #include <tqfile.h> -#include <layout.h> +#include <tqlayout.h> #include <tqmovie.h> #include <tqpainter.h> #include <tqtimer.h> @@ -224,7 +224,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; @@ -284,7 +284,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); @@ -315,7 +315,7 @@ void ExtensionContainer::readConfig() } positionChange(position()); - alignmentChange(alignment()); + alignmentChange(tqalignment()); setSize(static_cast<KPanelExtension::Size>(m_settings.size()), m_settings.customSize()); @@ -510,7 +510,7 @@ 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 @@ -523,7 +523,7 @@ void ExtensionContainer::moveMe() } 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; @@ -578,7 +578,7 @@ void ExtensionContainer::enableMouseOverEffects() KickerTip::enableTipping(true); TQPoint globalPos = TQCursor::pos(); TQPoint localPos = mapFromGlobal(globalPos); - TQWidget* child = childAt(localPos); + TQWidget* child = tqchildAt(localPos); if (child) { @@ -788,7 +788,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) @@ -900,7 +900,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) @@ -987,7 +987,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 @@ -1005,7 +1005,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())); @@ -1378,7 +1378,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(); } @@ -1408,11 +1408,11 @@ void ExtensionContainer::paintEvent(TQPaintEvent *e) // KPanelExtension::Left/Right don't seem to draw the separators at all! if (position() == KPanelExtension::Left) { rect = TQRect(width()-2,0,PANEL_RESIZE_HANDLE_WIDTH,height()); - tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal ); + tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, tqcolorGroup(), TQStyle::Style_Horizontal ); } else if (position() == KPanelExtension::Right) { rect = TQRect(0,0,PANEL_RESIZE_HANDLE_WIDTH,height()); - tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal ); + tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, tqcolorGroup(), TQStyle::Style_Horizontal ); } else if (position() == KPanelExtension::Top) { // Nastiness to both vertically flip the PE_Separator @@ -1420,14 +1420,14 @@ void ExtensionContainer::paintEvent(TQPaintEvent *e) TQPixmap inv_pm(width(),PANEL_RESIZE_HANDLE_WIDTH); TQPainter myp(TQT_TQPAINTDEVICE(&inv_pm)); rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH); - TQColorGroup darkcg = colorGroup(); - darkcg.setColor(TQColorGroup::Light, colorGroup().dark()); + TQColorGroup darkcg = tqcolorGroup(); + darkcg.setColor(TQColorGroup::Light, tqcolorGroup().dark()); tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &myp, rect, darkcg, TQStyle::Style_Default ); p.drawPixmap(0,height()-2,inv_pm); } else { rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH); - tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Default ); + tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, tqcolorGroup(), TQStyle::Style_Default ); } } } @@ -1444,7 +1444,7 @@ void ExtensionContainer::alignmentChange(KPanelExtension::Alignment a) return; } - m_extension->setAlignment(a); + m_extension->tqsetAlignment(a); } void ExtensionContainer::setSize(KPanelExtension::Size size, int custom) @@ -1551,7 +1551,7 @@ void ExtensionContainer::arrange(KPanelExtension::Position p, if (a != m_settings.alignment()) { m_settings.setAlignment(a); - setAlignment(a); + tqsetAlignment(a); } if (XineramaScreen != xineramaScreen()) @@ -1590,7 +1590,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. @@ -1777,7 +1777,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; @@ -1997,12 +1997,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()); } diff --git a/kicker/kicker/core/container_extension.h b/kicker/kicker/core/container_extension.h index 724ba0a10..3c7894db6 100644 --- a/kicker/kicker/core/container_extension.h +++ b/kicker/kicker/core/container_extension.h @@ -66,7 +66,7 @@ public: TQWidget *parent = 0); virtual ~ExtensionContainer(); - virtual TQSize sizeHint(KPanelExtension::Position, const TQSize &maxSize) const; + virtual TQSize tqsizeHint(KPanelExtension::Position, const TQSize &maxSize) const; const AppletInfo& info() const { return _info; } @@ -86,7 +86,7 @@ public: KPanelExtension::Orientation orientation() const; KPanelExtension::Position position() const; - void setPosition(KPanelExtension::Position p) { arrange( p, alignment(), xineramaScreen() ); } + void setPosition(KPanelExtension::Position p) { arrange( p, tqalignment(), xineramaScreen() ); } int xineramaScreen() const; void setXineramaScreen(int screen); @@ -100,8 +100,8 @@ public: void unhideIfHidden(int showForHowManyMS = 0); bool reserveStrut() const; - KPanelExtension::Alignment alignment() const; - void setAlignment(KPanelExtension::Alignment a) { arrange( position(), a, xineramaScreen() ); } + KPanelExtension::Alignment tqalignment() const; + void tqsetAlignment(KPanelExtension::Alignment a) { arrange( position(), a, xineramaScreen() ); } TQRect currentGeometry() const; TQRect initialGeometry(KPanelExtension::Position p, KPanelExtension::Alignment a, diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index a352284bc..00d781b98 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/kicker/kicker/core/containerarea.cpp @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqpainter.h> #include <tqpixmap.h> #include <tqstyle.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqtimer.h> #include <tqwmatrix.h> @@ -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; @@ -1639,7 +1639,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); @@ -1725,16 +1725,16 @@ void ContainerArea::setPosition(KPanelExtension::Position p) setBackground(); // container extension repaints for us! - //repaint(); + //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); } } @@ -1900,9 +1900,9 @@ TQStringList ContainerArea::listContainers() const return m_layout->listItems(); } -void ContainerArea::repaint() +void ContainerArea::tqrepaint() { - Panner::repaint(); + Panner::tqrepaint(); } void ContainerArea::showAddAppletDialog() @@ -1958,8 +1958,8 @@ void DragIndicator::paintEvent(TQPaintEvent*) { TQPainter painter(this); TQRect rect(0, 0, width(), height()); - tqstyle().tqdrawPrimitive( 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 54bbf6f48..3dc494798 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(); diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp index 68d0aafa4..e33a78518 100644 --- a/kicker/kicker/core/containerarealayout.cpp +++ b/kicker/kicker/core/containerarealayout.cpp @@ -43,7 +43,7 @@ class ContainerAreaLayoutIterator : public TQGLayoutIterator TQLayoutItem* current() { - return m_idx < int(m_list->count()) ? (*m_list->at(m_idx))->item : 0; + return m_idx < int(m_list->count()) ? (*m_list->tqat(m_idx))->item : 0; } TQLayoutItem* next() @@ -55,7 +55,7 @@ class ContainerAreaLayoutIterator : public TQGLayoutIterator TQLayoutItem* takeCurrent() { TQLayoutItem* item = 0; - ContainerAreaLayout::ItemList::iterator b = m_list->at(m_idx); + ContainerAreaLayout::ItemList::iterator b = m_list->tqat(m_idx); if (b != m_list->end()) { ContainerAreaLayoutItem* layoutItem = *b; @@ -81,7 +81,7 @@ int ContainerAreaLayoutItem::heightForWidth(int w) const } else { - return item->sizeHint().height(); + return item->tqsizeHint().height(); } } @@ -94,7 +94,7 @@ int ContainerAreaLayoutItem::widthForHeight(int h) const } else { - return item->sizeHint().width(); + return item->tqsizeHint().width(); } } @@ -223,7 +223,7 @@ int ContainerAreaLayout::count() const { \reimp */ TQLayoutItem* ContainerAreaLayout::itemAt(int index) const { - return index >= 0 && index < m_items.count() ? (*m_items.at(index))->item : 0; + return index >= 0 && index < m_items.count() ? (*m_items.tqat(index))->item : 0; } /*! @@ -232,8 +232,8 @@ TQLayoutItem* ContainerAreaLayout::itemAt(int index) const { 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)); + ContainerAreaLayoutItem *b = *m_items.tqat(index); + m_items.remove(m_items.tqat(index)); TQLayoutItem *item = b->item; b->item = 0; delete b; @@ -415,7 +415,7 @@ TQWidget* ContainerAreaLayout::widgetAt(int index) const return m_items[index]->item->widget(); } -TQSize ContainerAreaLayout::sizeHint() const +TQSize ContainerAreaLayout::tqsizeHint() const { const int size = KickerLib::sizeValue(KPanelExtension::SizeSmall); @@ -429,7 +429,7 @@ TQSize ContainerAreaLayout::sizeHint() const } } -TQSize ContainerAreaLayout::minimumSize() const +TQSize ContainerAreaLayout::tqminimumSize() const { const int size = KickerLib::sizeValue(KPanelExtension::SizeTiny); diff --git a/kicker/kicker/core/containerarealayout.h b/kicker/kicker/core/containerarealayout.h index 8347eba4c..41a104929 100644 --- a/kicker/kicker/core/containerarealayout.h +++ b/kicker/kicker/core/containerarealayout.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __containerarealayout_h__ #define __containerarealayout_h__ -#include <layout.h> +#include <tqlayout.h> class ContainerAreaLayout; @@ -83,8 +83,8 @@ class ContainerAreaLayout : public TQLayout 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); diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp index 26a5af71d..d3ec91e2c 100644 --- a/kicker/kicker/core/extensionmanager.cpp +++ b/kicker/kicker/core/extensionmanager.cpp @@ -371,7 +371,7 @@ void ExtensionManager::updateMenubar() KMenuBar tmpmenu; tmpmenu.insertItem("KDE Rocks!"); m_menubarPanel->setSize(KPanelExtension::SizeCustom, - tmpmenu.sizeHint().height()); + tmpmenu.tqsizeHint().height()); m_menubarPanel->writeConfig(); emit desktopIconsAreaChanged(desktopIconsArea(m_menubarPanel->xineramaScreen()), @@ -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/kicker.cpp b/kicker/kicker/core/kicker.cpp index 61a73c41b..f4d0edc40 100644 --- a/kicker/kicker/core/kicker.cpp +++ b/kicker/kicker/core/kicker.cpp @@ -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/kmenubase.ui b/kicker/kicker/core/kmenubase.ui index f76942c94..8a86f366d 100644 --- a/kicker/kicker/core/kmenubase.ui +++ b/kicker/kicker/core/kmenubase.ui @@ -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> @@ -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> @@ -222,7 +222,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>10</width> <height>20</height> @@ -241,7 +241,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>90</width> <height>24</height> @@ -270,7 +270,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>14</width> <height>20</height> diff --git a/kicker/kicker/core/menumanager.cpp b/kicker/kicker/core/menumanager.cpp index af24e50da..e6b7e3d60 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,8 +170,8 @@ void MenuManager::kmenuAccelActivated() { // We need the kmenu's size to place it at the right position. // We cannot rely on the popup menu's current size(), if it wasn't - // shown before, so we resize it here according to its sizeHint(). - const TQSize size = m_kmenu->sizeHint(); + // shown before, so we resize it here according to its tqsizeHint(). + const TQSize size = m_kmenu->tqsizeHint(); m_kmenu->resize(size.width(),size.height()); PanelPopupButton* button = findKButtonFor(m_kmenu->widget()); diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp index 6a4e9fd14..d11c14c28 100644 --- a/kicker/kicker/core/panelextension.cpp +++ b/kicker/kicker/core/panelextension.cpp @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqframe.h> #include <tqvalidator.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpainter.h> #include <tqstyle.h> @@ -100,7 +100,7 @@ void PanelExtension::populateContainerArea() { _containerArea->show(); - if (ExtensionManager::the()->isMainPanel(topLevelWidget())) + if (ExtensionManager::the()->isMainPanel(tqtopLevelWidget())) { setObjId("Panel"); _containerArea->initialize(true); @@ -139,7 +139,7 @@ void PanelExtension::positionChange(Position p) _containerArea->setPosition(p); } -TQSize PanelExtension::sizeHint(Position p, TQSize maxSize) const +TQSize PanelExtension::tqsizeHint(Position p, TQSize maxSize) const { TQSize size; diff --git a/kicker/kicker/core/panelextension.h b/kicker/kicker/core/panelextension.h index c7882291f..61e6c229c 100644 --- a/kicker/kicker/core/panelextension.h +++ b/kicker/kicker/core/panelextension.h @@ -80,7 +80,7 @@ k_dcop: void configure(); // KDE4: remove, moved to Kikcker public: - TQSize sizeHint(Position, TQSize maxSize) const; + TQSize tqsizeHint(Position, TQSize maxSize) const; Position preferedPosition() const { return Bottom; } bool eventFilter( TQObject *, TQEvent * ); diff --git a/kicker/kicker/core/userrectsel.h b/kicker/kicker/core/userrectsel.h index 564a6d980..0e9533e08 100644 --- a/kicker/kicker/core/userrectsel.h +++ b/kicker/kicker/core/userrectsel.h @@ -43,17 +43,17 @@ class UserRectSel : public TQWidget 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 TQWidget { 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 TQWidget 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/kicker-3.4-reverseLayout.cpp b/kicker/kicker/kicker-3.4-reverseLayout.cpp index f2beb38f1..97a35aff6 100644 --- a/kicker/kicker/kicker-3.4-reverseLayout.cpp +++ b/kicker/kicker/kicker-3.4-reverseLayout.cpp @@ -2,7 +2,7 @@ #include <tqmap.h> #include <tqregexp.h> #include <tqstring.h> -#include <textstream.h> +#include <tqtextstream.h> #include <kapplication.h> #include <kcmdlineargs.h> 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/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp index c5fc8d84f..163a4ae9d 100644 --- a/kicker/kicker/ui/addapplet.cpp +++ b/kicker/kicker/ui/addapplet.cpp @@ -27,9 +27,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqdir.h> #include <tqframe.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlineedit.h> -#include <palette.h> +#include <tqpalette.h> #include <tqscrollview.h> #include <tqtimer.h> #include <tqsizepolicy.h> @@ -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; @@ -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) { diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp index e5fa5672c..7f4f90676 100644 --- a/kicker/kicker/ui/addappletvisualfeedback.cpp +++ b/kicker/kicker/ui/addappletvisualfeedback.cpp @@ -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/appletitem.ui b/kicker/kicker/ui/appletitem.ui index 46e62b342..dc6faab50 100644 --- a/kicker/kicker/ui/appletitem.ui +++ b/kicker/kicker/ui/appletitem.ui @@ -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> @@ -65,7 +65,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -87,7 +87,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -105,7 +105,7 @@ <property name="name"> <cstring>itemPixmap</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>64</width> <height>64</height> @@ -117,7 +117,7 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp index 1ef72d2c7..925571e61 100644 --- a/kicker/kicker/ui/appletop_mnu.cpp +++ b/kicker/kicker/ui/appletop_mnu.cpp @@ -52,7 +52,7 @@ 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 @@ -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/appletview.ui b/kicker/kicker/ui/appletview.ui index f5a32651b..4ba0f38e8 100644 --- a/kicker/kicker/ui/appletview.ui +++ b/kicker/kicker/ui/appletview.ui @@ -110,7 +110,7 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>284</width> <height>20</height> diff --git a/kicker/kicker/ui/browser_dlg.cpp b/kicker/kicker/ui/browser_dlg.cpp index 2ca76cc3e..01e72d9ee 100644 --- a/kicker/kicker/ui/browser_dlg.cpp +++ b/kicker/kicker/ui/browser_dlg.cpp @@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqvbox.h> #include <kglobal.h> diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp index 4998fc5cf..ee62791e9 100644 --- a/kicker/kicker/ui/browser_mnu.cpp +++ b/kicker/kicker/ui/browser_mnu.cpp @@ -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 diff --git a/kicker/kicker/ui/clicklineedit.cpp b/kicker/kicker/ui/clicklineedit.cpp index c5499f217..1793d97b3 100644 --- a/kicker/kicker/ui/clicklineedit.cpp +++ b/kicker/kicker/ui/clicklineedit.cpp @@ -39,13 +39,13 @@ ClickLineEdit::~ClickLineEdit() {} void ClickLineEdit::setClickMessage( const TQString &msg ) { mClickMessage = msg; - repaint(); + tqrepaint(); } void ClickLineEdit::setText( const TQString &txt ) { mDrawClickMsg = txt.isEmpty(); - repaint(); + tqrepaint(); KLineEdit::setText( txt ); } @@ -67,7 +67,7 @@ void ClickLineEdit::focusInEvent( TQFocusEvent *ev ) if ( mDrawClickMsg == true ) { mDrawClickMsg = false; - repaint(); + tqrepaint(); } TQLineEdit::focusInEvent( ev ); } @@ -77,7 +77,7 @@ void ClickLineEdit::focusOutEvent( TQFocusEvent *ev ) if ( text().isEmpty() ) { mDrawClickMsg = true; - repaint(); + tqrepaint(); } TQLineEdit::focusOutEvent( ev ); } diff --git a/kicker/kicker/ui/client_mnu.cpp b/kicker/kicker/ui/client_mnu.cpp index 959726bfa..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(static_cast<const char *>(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/exe_dlg.cpp b/kicker/kicker/ui/exe_dlg.cpp index 6b1dd15ef..d39fb5942 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() 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/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 25263e872..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); } @@ -173,14 +173,14 @@ void HideButton::slotIconChanged(int group) } generateIcons(); - repaint(false); + tqrepaint(false); } void HideButton::enterEvent(TQEvent *e) { m_highlight = true; - repaint(false); + tqrepaint(false); TQButton::enterEvent(e); } @@ -188,7 +188,7 @@ void HideButton::leaveEvent(TQEvent *e) { m_highlight = false; - repaint(false); + tqrepaint(false); TQButton::enterEvent(e); } diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp index 79a7430b5..f9ab06006 100644 --- a/kicker/kicker/ui/itemview.cpp +++ b/kicker/kicker/ui/itemview.cpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqpainter.h> #include <tqstyle.h> #include <tqwidgetstack.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqvbox.h> #include <tqheader.h> @@ -41,7 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqpaintdevicemetrics.h> #include <tqbuffer.h> #include <tqtooltip.h> -#include <stylesheet.h> +#include <tqstylesheet.h> #include <tqiconview.h> #include <dcopclient.h> @@ -145,7 +145,7 @@ void KMenuItem::setIcon(const TQString& icon, int size) void KMenuItem::setHasChildren( bool flag ) { m_has_children = flag; - repaint(); + tqrepaint(); } void KMenuItem::setup() @@ -166,7 +166,7 @@ void KMenuItem::setup() void KMenuItem::paintCell(TQPainter* p, const TQColorGroup & cg, int column, int width, int align) { ItemView *listview = static_cast<ItemView*>( listView() ); - int bottom = listView()->itemRect( this ).bottom(); + int bottom = listView()->tqitemRect( this ).bottom(); int diff = bottom - listView()->viewport()->height(); KPixmap pm; @@ -197,7 +197,7 @@ void KMenuItem::paintCell(TQPainter* p, const TQColorGroup & cg, int column, int else listview->m_lastOne = static_cast<KMenuItem*>( itemBelow() ); listview->m_old_contentY = -1; - repaint(); + tqrepaint(); } } } @@ -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(); } } @@ -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 ) ); @@ -915,7 +915,7 @@ void ItemView::contentsMousePressEvent ( TQMouseEvent * e ) KMenuItemSeparator *si = dynamic_cast<KMenuItemSeparator*>( itemAt( vp ) ); if ( si ) { - if ( si->hitsLink( vp - itemRect(si).topLeft() ) ) + if ( si->hitsLink( vp - tqitemRect(si).topLeft() ) ) emit startURL( si->linkUrl() ); } } @@ -928,7 +928,7 @@ void ItemView::contentsMouseMoveEvent(TQMouseEvent *e) bool link_cursor = false; KMenuItemSeparator *si = dynamic_cast<KMenuItemSeparator*>( i ); if ( si ) - link_cursor = si->hitsLink( vp - itemRect(si).topLeft() ); + link_cursor = si->hitsLink( vp - tqitemRect(si).topLeft() ); if (i && !i->isSelectable() && !link_cursor) { unsetCursor(); @@ -965,7 +965,7 @@ void ItemView::resizeEvent ( TQResizeEvent * e ) { KListView::resizeEvent( e ); // if ( m_lastOne ) -// int diff = itemRect( m_lastOne ).bottom() - viewport()->height(); +// int diff = tqitemRect( m_lastOne ).bottom() - viewport()->height(); } void ItemView::viewportPaintEvent ( TQPaintEvent * pe ) @@ -975,7 +975,7 @@ void ItemView::viewportPaintEvent ( TQPaintEvent * pe ) if ( m_lastOne && m_old_contentY != contentsY() ) { m_old_contentY = contentsY(); - m_lastOne->repaint(); + m_lastOne->tqrepaint(); } } @@ -1052,7 +1052,7 @@ TQDragObject * ItemView::dragObject() else if(!kitem->path().isEmpty() && !kitem->path().startsWith("kicker:/") && !kitem->path().startsWith("kaddressbook:/")) { TQString uri = kitem->path(); - if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { + if (uri.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) { KDesktopFile df(uri,true); uri=df.readURL(); } @@ -1103,7 +1103,7 @@ const char * KMenuItemDrag::format(int i) const return 0; } -TQByteArray KMenuItemDrag::encodedData(const char* mimeType) const +TQByteArray KMenuItemDrag::tqencodedData(const char* mimeType) const { if (TQString("application/kmenuitem") == mimeType) return a; @@ -1138,7 +1138,7 @@ bool ItemView::acceptDrag (TQDropEvent* event) const bool KMenuItemDrag::decode(const TQMimeSource* e, KMenuItemInfo& item) { - TQByteArray a = e->encodedData("application/kmenuitem"); + TQByteArray a = e->tqencodedData("application/kmenuitem"); if (a.isEmpty()) { TQStringList l; @@ -1211,7 +1211,7 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const TQString uri = item.m_path; - if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { + if (uri.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) { KDesktopFile df(uri,true); uri=df.readURL(); } 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 a78971927..6953143c9 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -211,7 +211,7 @@ void PanelKMenu::paletteChanged() if (!loadSidePixmap()) { sidePixmap = sideTilePixmap = TQPixmap(); - setMinimumSize( sizeHint() ); + setMinimumSize( tqsizeHint() ); } } @@ -348,7 +348,7 @@ void PanelKMenu::initialize() if (clients.count() > 0) { TQIntDictIterator<KickerClientMenu> it(clients); while (it){ - if (it.current()->text.at(0) != '.') + if (it.current()->text.tqat(0) != '.') insertItem( it.current()->icon, it.current()->text, @@ -419,10 +419,10 @@ void PanelKMenu::repairDisplay(void) { displayRepairTimer->stop(); // Now do a nasty hack to prevent search bar merging into the side image - // This forces a layout/repaint of the qpopupmenu - repaint(); // This ensures that the side bar image was applied + // This forces a 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 repaints the entire popup menu to apply the widget size/alignment changes made above + update(); // This repaints the entire popup menu to apply the widget size/tqalignment changes made above } } @@ -584,7 +584,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 ); } @@ -595,21 +595,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; } @@ -626,7 +626,7 @@ void PanelKMenu::paintEvent(TQPaintEvent * e) 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(); diff --git a/kicker/kicker/ui/k_mnu.h b/kicker/kicker/ui/k_mnu.h index 53a29d809..f7ad2ee77 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 2725d3de1..e27f47d88 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -31,11 +31,11 @@ #include <tqpainter.h> #include <tqstyle.h> #include <tqwidgetstack.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqregexp.h> #include <tqfile.h> -#include <stylesheet.h> +#include <tqstylesheet.h> #include <tqaccel.h> #include <tqcursor.h> #include <tqdir.h> @@ -302,7 +302,7 @@ KMenu::KMenu() m_searchInternet->setPixmap(0,icon); setTabOrder(m_kcommand, m_searchResultsWidget); - m_kerryInstalled = !KStandardDirs::findExe(TQString::fromLatin1("kerry")).isEmpty(); + m_kerryInstalled = !KStandardDirs::findExe(TQString::tqfromLatin1("kerry")).isEmpty(); m_isShowing = false; if (!m_kerryInstalled) { @@ -421,7 +421,7 @@ void KMenu::setupUi() { m_stacker = new TQWidgetStack( this, "m_stacker" ); m_stacker->setGeometry( TQRect( 90, 260, 320, 220 ) ); - m_stacker->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 1, 1, m_stacker->sizePolicy().hasHeightForWidth() ) ); + m_stacker->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 1, 1, m_stacker->sizePolicy().hasHeightForWidth() ) ); m_stacker->setPaletteBackgroundColor( TQColor( 255, 255, 255 ) ); // m_stacker->setFocusPolicy( TQ_StrongFocus ); m_stacker->setLineWidth( 0 ); @@ -522,7 +522,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) m_sloppySourceClicked = true; if (!m_sloppyTimer.isActive() || m_sloppySource != raiseRect) { - int timeout= tqstyle().styleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay); + int timeout= tqstyle().tqstyleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay); if (m_sloppySourceClicked) timeout = 3000; m_sloppyTimer.start(timeout); @@ -1131,7 +1131,7 @@ void KMenu::fillMenu(KServiceGroup::Ptr& } // Ignore dotfiles. - if ((g->name().at(0) == '.')) + if ((g->name().tqat(0) == '.')) { continue; } @@ -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(); @@ -1923,7 +1923,7 @@ 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); @@ -1978,7 +1978,7 @@ void KMenu::createNewProgramList(TQString relPath) if (!found) { m_seenProgramsChanged=true; m_seenPrograms+=shortStorageId; - m_seenPrograms+=m_currentDate; + m_seenPrograms+=m_tqcurrentDate; if (m_newInstalledPrograms.find(s->storageId())==m_newInstalledPrograms.end()) m_newInstalledPrograms+=s->storageId(); } @@ -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(); } @@ -2936,7 +2936,7 @@ void KMenu::slotContextMenu(int selected) case EditMenu: accept(); proc = new KProcess(TQT_TQOBJECT(this)); - *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); + *proc << KStandardDirs::findExe(TQString::tqfromLatin1("kmenuedit")); *proc << "/"+m_popupPath.menuPath.section('/',-200,-2) << m_popupPath.menuPath.section('/', -1); proc->start(); break; @@ -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 )); } } } @@ -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; } @@ -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(); } @@ -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 3c6b68bc2..6a41a719b 100644 --- a/kicker/kicker/ui/kickoff_bar.cpp +++ b/kicker/kicker/ui/kickoff_bar.cpp @@ -58,8 +58,8 @@ void KickoffTabBar::paint(TQPainter* p, TQTab* t, bool selected) const //selection flags if(t->rect().contains(mapFromGlobal(TQCursor::pos()))) flags |= TQStyle::Style_MouseOver; - tqstyle().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,7 +70,7 @@ void KickoffTabBar::paintLabel(TQPainter* p, const TQRect& br, TQTab* t, bool ha TQRect r = br; bool selected = m_tabsActivated && (currentTab() == t->identifier()); - int vframe = tqstyle().pixelMetric( TQStyle::PM_TabBarTabVSpace, this ); + int vframe = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabVSpace, this ); p->setFont( font() ); TQFontMetrics fm = p->fontMetrics(); @@ -116,14 +116,14 @@ void KickoffTabBar::paintLabel(TQPainter* p, const TQRect& br, TQTab* t, bool ha // flags |= TQStyle::Style_Sunken; if(t->rect().contains(mapFromGlobal(TQCursor::pos()))) flags |= TQStyle::Style_MouseOver; - tqstyle().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; } @@ -135,9 +135,9 @@ void KickoffTabBar::layoutTabs() TQFontMetrics fm = fontMetrics(); int fh = ((KickerSettings::kickoffTabBarFormat() != KickerSettings::IconOnly) ? fm.height() : 0) + 4; - int hframe = tqstyle().pixelMetric( TQStyle::PM_TabBarTabHSpace, this ); - int vframe = tqstyle().pixelMetric( TQStyle::PM_TabBarTabVSpace, this ); - int overlap = tqstyle().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) 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 ee4f26ffa..0b49763a1 100644 --- a/kicker/kicker/ui/kmenuitembase.ui +++ b/kicker/kicker/ui/kmenuitembase.ui @@ -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> @@ -73,7 +73,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -102,7 +102,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -120,7 +120,7 @@ <property name="name"> <cstring>itemPixmap</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>64</width> <height>64</height> @@ -129,7 +129,7 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop|AlignHCenter</set> </property> </widget> diff --git a/kicker/kicker/ui/nonKDEButtonSettings.ui b/kicker/kicker/ui/nonKDEButtonSettings.ui index 187dd7cb5..a3f04e6a8 100644 --- a/kicker/kicker/ui/nonKDEButtonSettings.ui +++ b/kicker/kicker/ui/nonKDEButtonSettings.ui @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -140,13 +140,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>58</width> <height>58</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>58</width> <height>58</height> @@ -199,7 +199,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>8</height> diff --git a/kicker/kicker/ui/popupmenutitle.h b/kicker/kicker/ui/popupmenutitle.h index 1e15179f7..c9e545417 100644 --- a/kicker/kicker/ui/popupmenutitle.h +++ b/kicker/kicker/ui/popupmenutitle.h @@ -69,11 +69,11 @@ public: m_font.setBold(true); } - TQSize sizeHint() + TQSize tqsizeHint() { TQSize size = TQFontMetrics(m_font).size(AlignHCenter, m_desktopName); size.setHeight(size.height() + - (kapp->tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1)); + (kapp->tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1)); return size; } diff --git a/kicker/kicker/ui/removeapplet_mnu.cpp b/kicker/kicker/ui/removeapplet_mnu.cpp index 2e0543dae..8dfaa00d2 100644 --- a/kicker/kicker/ui/removeapplet_mnu.cpp +++ b/kicker/kicker/ui/removeapplet_mnu.cpp @@ -87,9 +87,9 @@ void PanelRemoveAppletMenu::slotAboutToShow() void PanelRemoveAppletMenu::slotExec(int id) { - if (m_containers.at(id) != m_containers.end()) + if (m_containers.tqat(id) != m_containers.end()) { - m_containerArea->removeContainer(*m_containers.at(id)); + m_containerArea->removeContainer(*m_containers.tqat(id)); } } diff --git a/kicker/kicker/ui/removebutton_mnu.cpp b/kicker/kicker/ui/removebutton_mnu.cpp index 8f02abd67..678d6a78f 100644 --- a/kicker/kicker/ui/removebutton_mnu.cpp +++ b/kicker/kicker/ui/removebutton_mnu.cpp @@ -95,9 +95,9 @@ void PanelRemoveButtonMenu::slotAboutToShow() void PanelRemoveButtonMenu::slotExec( int id ) { - if (containers.at(id) != containers.end()) + if (containers.tqat(id) != containers.end()) { - containerArea->removeContainer(*containers.at(id)); + containerArea->removeContainer(*containers.tqat(id)); } } diff --git a/kicker/kicker/ui/removeextension_mnu.cpp b/kicker/kicker/ui/removeextension_mnu.cpp index 9d5d80d2b..9a1655bae 100644 --- a/kicker/kicker/ui/removeextension_mnu.cpp +++ b/kicker/kicker/ui/removeextension_mnu.cpp @@ -100,9 +100,9 @@ void PanelRemoveExtensionMenu::slotExec( int id ) { ExtensionManager::the()->removeAllContainers(); } - else if (m_containers.at(id) != m_containers.end()) + else if (m_containers.tqat(id) != m_containers.end()) { - ExtensionManager::the()->removeContainer(*m_containers.at(id)); + ExtensionManager::the()->removeContainer(*m_containers.tqat(id)); } } diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index 8dcc2fbde..ee0414644 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/kicker/kicker/ui/service_mnu.cpp @@ -281,7 +281,7 @@ void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root, } // Ignore dotfiles. - if ((g->name().at(0) == '.')) + if ((g->name().tqat(0) == '.')) { continue; } @@ -445,7 +445,7 @@ void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId, return; // ignore dotfiles. - if ((serviceName.at(0) == '.')) + if ((serviceName.tqat(0) == '.')) return; // item names may contain ampersands. To avoid them being converted @@ -695,7 +695,7 @@ void PanelServiceMenu::slotContextMenu(int selected) case EditItem: proc = new KProcess(TQT_TQOBJECT(this)); - *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); + *proc << KStandardDirs::findExe(TQString::tqfromLatin1("kmenuedit")); *proc << "/"+relPath_ << static_cast<KService *>(contextKSycocaEntry_)->menuId(); proc->start(); break; @@ -739,7 +739,7 @@ void PanelServiceMenu::slotContextMenu(int selected) case EditMenu: proc = new KProcess(TQT_TQOBJECT(this)); - *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); + *proc << KStandardDirs::findExe(TQString::tqfromLatin1("kmenuedit")); *proc << "/"+static_cast<KServiceGroup *>(contextKSycocaEntry_)->relPath(); proc->start(); break; diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp index d4735c2ba..3265c428c 100644 --- a/kicker/libkicker/global.cpp +++ b/kicker/libkicker/global.cpp @@ -161,7 +161,7 @@ int maxButtonDim() int maxDim; //return (2 * KickerSettings::iconMargin()) + KIcon::SizeLarge; - KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" )); + KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::tqfromLatin1( "kickerrc" )); kickerconfig->setGroup("General"); maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);; delete kickerconfig; @@ -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)) diff --git a/kicker/libkicker/kickerSettings.kcfg b/kicker/libkicker/kickerSettings.kcfg index 7e1e26651..635d9c646 100644 --- a/kicker/libkicker/kickerSettings.kcfg +++ b/kicker/libkicker/kickerSettings.kcfg @@ -81,7 +81,7 @@ <entry name="TintColor" type="Color" > <label>The tint color used to colorize transparent panels</label> - <default code="true">(TQApplication::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/kickertip.cpp b/kicker/libkicker/kickertip.cpp index 490f5bbfe..e1975a693 100644 --- a/kicker/libkicker/kickertip.cpp +++ b/kicker/libkicker/kickertip.cpp @@ -392,8 +392,8 @@ void KickerTip::displayInternal() // draw background TQPainter bufferPainter(&m_pixmap); - bufferPainter.setPen(colorGroup().foreground()); - bufferPainter.setBrush(colorGroup().background()); + bufferPainter.setPen(tqcolorGroup().foreground()); + bufferPainter.setBrush(tqcolorGroup().background()); //bufferPainter.drawRoundRect(0, 0, width, height, 1600 / width, 1600 / height); drawRoundRect(bufferPainter, TQRect(0, 0, width, height)); @@ -409,13 +409,13 @@ void KickerTip::displayInternal() if (KickerSettings::mouseOversShowText()) { // draw text shadow - TQColorGroup cg = colorGroup(); + TQColorGroup cg = tqcolorGroup(); cg.setColor(TQColorGroup::Text, cg.background().dark(115)); int shadowOffset = TQApplication::reverseLayout() ? -1 : 1; m_richText->draw(&bufferPainter, textX + shadowOffset, textY + 1, TQRect(), cg); // draw text - cg = colorGroup(); + cg = tqcolorGroup(); m_richText->draw(&bufferPainter, textX, textY, rect(), cg); } } @@ -458,7 +458,7 @@ void KickerTip::tipperDestroyed(TQObject* o) void KickerTip::internalUpdate() { m_dirty = true; - repaint(false); + tqrepaint(false); } void KickerTip::enableTipping(bool tip) diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp index 5c3e960cd..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"); diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp index 1502e4943..4d60068a8 100644 --- a/kicker/libkicker/panelbutton.cpp +++ b/kicker/libkicker/panelbutton.cpp @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqpainter.h> #include <tqpopupmenu.h> #include <tqstyle.h> -#include <stylesheet.h> +#include <tqstylesheet.h> #include <tqtooltip.h> #include <tqpixmap.h> @@ -438,7 +438,7 @@ void PanelButton::enterEvent(TQEvent* e) if (!m_highlight && m_disableHighlighting == FALSE) { m_highlight = true; - repaint(false); + tqrepaint(false); } TQButton::enterEvent(e); @@ -449,7 +449,7 @@ void PanelButton::leaveEvent(TQEvent* e) if (m_highlight) { m_highlight = false; - repaint(false); + tqrepaint(false); } TQButton::leaveEvent(e); @@ -539,7 +539,7 @@ void PanelButton::drawButton(TQPainter *p) if (m_tileColor.isValid()) { p->fillRect(rect(), m_tileColor); - tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup()); + tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup()); } else if (paletteBackgroundPixmap()) { @@ -558,8 +558,8 @@ void PanelButton::drawButton(TQPainter *p) } else if (isDown() || isOn()) { - // Draw shapes to indicate the down state. - tqstyle().tqdrawPrimitive(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); @@ -569,8 +569,8 @@ void PanelButton::drawButton(TQPainter *p) int 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); - tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(), - TQStyle::Style_Default, colorGroup().button()); + tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, tqcolorGroup(), + TQStyle::Style_Default, tqcolorGroup().button()); } } @@ -581,7 +581,7 @@ void PanelButton::drawDeepButton(TQPainter *p) if (m_tileColor.isValid()) { p->fillRect(rect(), m_tileColor); - tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup()); + tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup()); } else if (paletteBackgroundPixmap()) { @@ -595,10 +595,10 @@ void PanelButton::drawDeepButton(TQPainter *p) TQRect btn_rect = TQRect(rect().x(), rect().y()+1, rect().width(), rect().height()-2); if (isDown() || isOn()) { - tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Down); + tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, tqcolorGroup(), TQStyle::Style_Down); } else { - tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Raised); + tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, tqcolorGroup(), TQStyle::Style_Raised); } drawButtonLabel(p,0,FALSE); @@ -608,8 +608,8 @@ void PanelButton::drawDeepButton(TQPainter *p) int 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); - tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(), - TQStyle::Style_Default, colorGroup().button()); + tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, tqcolorGroup(), + TQStyle::Style_Default, tqcolorGroup().button()); } } @@ -718,7 +718,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow) if (m_drawArrow && (m_highlight || active) && drawArrow) { TQStyle::PrimitiveElement e = TQStyle::PE_ArrowUp; - int arrowSize = tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator); + int arrowSize = tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator); TQRect r((width() - arrowSize)/2, 0, arrowSize, arrowSize); switch (m_arrowDirection) @@ -762,7 +762,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow) { flags |= TQStyle::Style_Down; } - tqstyle().tqdrawPrimitive(e, p, r, colorGroup(), flags); + tqstyle().tqdrawPrimitive(e, p, r, tqcolorGroup(), flags); } } 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 6684c32c6..7388f4dbc 100644 --- a/kicker/libkicker/paneldrag.h +++ b/kicker/libkicker/paneldrag.h @@ -39,7 +39,7 @@ class KDE_EXPORT PanelDrag : public TQDragObject ~PanelDrag(); virtual const char * format(int i = 0) const; - virtual TQByteArray encodedData(const char *) const; + virtual TQByteArray tqencodedData(const char *) const; static bool canDecode(const TQMimeSource * e); static bool decode(const TQMimeSource* e, BaseContainer** container); @@ -55,7 +55,7 @@ class KDE_EXPORT AppletInfoDrag : public TQDragObject ~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 317fb6351..1dc592bbd 100644 --- a/kicker/libkicker/panner.cpp +++ b/kicker/libkicker/panner.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <layout.h> +#include <tqlayout.h> #include <tqtooltip.h> #include <tqtimer.h> #include <tqpainter.h> @@ -103,8 +103,8 @@ void Panner::setupButtons() { _luSB->setArrowType(Qt::LeftArrow); _rdSB->setArrowType(Qt::RightArrow); - _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); - _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); + _luSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); + _rdSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); TQToolTip::add(_luSB, i18n("Scroll left")); TQToolTip::add(_rdSB, i18n("Scroll right")); setMinimumSize(24, 0); @@ -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); diff --git a/kicker/libkicker/panner.h b/kicker/libkicker/panner.h index 7ae68d096..2f09d76f1 100644 --- a/kicker/libkicker/panner.h +++ b/kicker/libkicker/panner.h @@ -39,7 +39,7 @@ public: Panner( TQWidget* parent, const char* name = 0 ); ~Panner(); - TQSize minimumSizeHint() const { return TQWidget::minimumSizeHint(); } + TQSize tqminimumSizeHint() const { return TQWidget::tqminimumSizeHint(); } Qt::Orientation orientation() const { return _orient; } virtual void setOrientation(Qt::Orientation orientation); diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp index f809c2127..4aa0b9ff3 100644 --- a/kicker/libkicker/simplebutton.cpp +++ b/kicker/libkicker/simplebutton.cpp @@ -71,22 +71,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()); } @@ -99,7 +99,7 @@ void SimpleButton::drawButton( TQPainter *p ) if (m_highlight || isDown() || isOn()) { int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; if (isDown() || isOn()) flags |= TQStyle::Style_Down; - tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, r, colorGroup(), flags); + tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, r, tqcolorGroup(), flags); } } @@ -202,7 +202,7 @@ void SimpleButton::enterEvent( TQEvent *e ) if (KickerSettings::showMouseOverEffects()) m_highlight = true; - repaint( false ); + tqrepaint( false ); TQButton::enterEvent( e ); } @@ -210,7 +210,7 @@ void SimpleButton::leaveEvent( TQEvent *e ) { m_highlight = false; - repaint( false ); + tqrepaint( false ); TQButton::enterEvent( e ); } @@ -229,7 +229,7 @@ SimpleArrowButton::SimpleArrowButton(TQWidget *parent, Qt::ArrowType arrow, cons _inside = false; } -TQSize SimpleArrowButton::sizeHint() const +TQSize SimpleArrowButton::tqsizeHint() const { return TQSize( 12, 12 ); } @@ -263,7 +263,7 @@ void SimpleArrowButton::drawButton( TQPainter *p ) int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; if (isDown() || isOn()) flags |= TQStyle::Style_Down; - tqstyle().tqdrawPrimitive(pe, p, r, colorGroup(), flags); + tqstyle().tqdrawPrimitive(pe, p, r, tqcolorGroup(), flags); if (m_forceStandardCursor) { SimpleButton::drawButton(p); diff --git a/kicker/libkicker/simplebutton.h b/kicker/libkicker/simplebutton.h index bbfcbd79d..8e4c13896 100644 --- a/kicker/libkicker/simplebutton.h +++ b/kicker/libkicker/simplebutton.h @@ -34,8 +34,8 @@ class KDE_EXPORT SimpleButton : public TQButton SimpleButton(TQWidget *parent, const char *name = 0, bool forceStandardCursor = FALSE); 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 ); @@ -68,7 +68,7 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton public: SimpleArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0, bool forceStandardCursor = FALSE); virtual ~SimpleArrowButton() {}; - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected: virtual void enterEvent( TQEvent *e ); diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp index 7eab40c34..e9f1cede1 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 63292a472..e515e41f5 100644 --- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp +++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp @@ -3,7 +3,7 @@ #include <stdio.h> #include <stdlib.h> -#include <textstream.h> +#include <tqtextstream.h> #include <kbookmarkimporter.h> #include <kmimetype.h> diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp index c2335702e..1643195e8 100644 --- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp +++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp @@ -1,7 +1,7 @@ #include <stdio.h> #include <stdlib.h> -#include <textstream.h> +#include <tqtextstream.h> #include <kbookmarkimporter.h> #include <kmimetype.h> diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp index 93a948dee..3f50e5275 100644 --- a/kicker/menuext/prefmenu/prefmenu.cpp +++ b/kicker/menuext/prefmenu/prefmenu.cpp @@ -113,7 +113,7 @@ void PrefMenu::insertMenuItem(KService::Ptr& s, } // ignore dotfiles. - if ((serviceName.at(0) == '.')) + if ((serviceName.tqat(0) == '.')) { return; } @@ -290,7 +290,7 @@ void PrefMenu::initialize() } // Ignore dotfiles. - if ((g->name().at(0) == '.')) + if ((g->name().tqat(0) == '.')) { continue; } diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc index 6b30f0ef6..f2689bc1f 100644 --- a/kicker/menuext/tom/tom.cc +++ b/kicker/menuext/tom/tom.cc @@ -26,7 +26,7 @@ using namespace std; #include <tqdir.h> #include <tqimage.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpainter.h> #include <tqregexp.h> #include <tqsettings.h> @@ -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:")); @@ -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) 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(); diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp index b472356e1..0f18914f3 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -228,7 +228,7 @@ KPanelApplet* AppletProxy::loadApplet(const AppletInfo& info) void AppletProxy::repaintApplet(TQWidget* widget) { - widget->repaint(); + widget->tqrepaint(); const TQObjectList children = widget->childrenListObject(); @@ -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,7 +435,7 @@ 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); diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp index 25ac426e0..796f10c93 100644 --- a/kicker/proxy/extensiondebugger.cpp +++ b/kicker/proxy/extensiondebugger.cpp @@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ #include <tqfile.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <kapplication.h> diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index 48a64c612..d4b4d67d6 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -258,7 +258,7 @@ void ExtensionProxy::dock(const TQCString& callbackID) bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &replyData) { - if ( fun == "sizeHint(int,TQSize)" ) + if ( fun == "tqsizeHint(int,TQSize)" ) { TQDataStream dataStream( data, IO_ReadOnly ); int pos; @@ -272,7 +272,7 @@ bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data, if(!_extension) reply << maxSize; else - reply << _extension->sizeHint((KPanelExtension::Position)pos, maxSize); + reply << _extension->tqsizeHint((KPanelExtension::Position)pos, maxSize); return true; } @@ -287,14 +287,14 @@ bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data, } return true; } - else if ( fun == "setAlignment(int)" ) + else if ( fun == "tqsetAlignment(int)" ) { TQDataStream dataStream( data, IO_ReadOnly ); - int alignment; - dataStream >> alignment; + int tqalignment; + dataStream >> tqalignment; if(_extension) { - _extension->setAlignment( (KPanelExtension::Alignment)alignment ); + _extension->tqsetAlignment( (KPanelExtension::Alignment)tqalignment ); } return true; } diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp index 3366f1be3..4da304daf 100644 --- a/kicker/taskbar/taskbar.cpp +++ b/kicker/taskbar/taskbar.cpp @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqapplication.h> #include <tqbitmap.h> #include <tqdesktopwidget.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpainter.h> #include <tqstringlist.h> @@ -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++) @@ -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 @@ -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 ); } } @@ -1074,7 +1074,7 @@ void TaskBar::activateNextTask(bool forward) TaskContainer::List::iterator it; for (int i = 0; i < numContainers; ++i) { - it = forward ? list.at(i) : list.at(numContainers - i - 1); + it = forward ? list.tqat(i) : list.tqat(numContainers - i - 1); if (it != list.end() && (*it)->activateNextTask(forward, forcenext)) { @@ -1087,7 +1087,7 @@ void TaskBar::activateNextTask(bool forward) // moving forward from the last, or backward from the first, loop around for (int i = 0; i < numContainers; ++i) { - it = forward ? list.at(i) : list.at(numContainers - i - 1); + it = forward ? list.tqat(i) : list.tqat(numContainers - i - 1); if (it != list.end() && (*it)->activateNextTask(forward, forcenext)) { @@ -1101,7 +1101,7 @@ void TaskBar::activateNextTask(bool forward) forcenext = true; // select first for (int i = 0; i < numContainers; ++i) { - it = forward ? list.at(i) : list.at(numContainers - i - 1); + it = forward ? list.tqat(i) : list.tqat(numContainers - i - 1); if (it == list.end()) { diff --git a/kicker/taskbar/taskbar.h b/kicker/taskbar/taskbar.h index 9f56565e3..40b02b6ea 100644 --- a/kicker/taskbar/taskbar.h +++ b/kicker/taskbar/taskbar.h @@ -47,8 +47,8 @@ public: TaskBar( TQWidget *parent = 0, const char *name = 0 ); ~TaskBar(); - TQSize sizeHint() const; - TQSize sizeHint( KPanelExtension::Position, TQSize maxSize ) const; + TQSize tqsizeHint() const; + TQSize tqsizeHint( KPanelExtension::Position, TQSize maxSize ) const; void setOrientation( Orientation ); void setArrowType( TQt::ArrowType at ); diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp index 754894d17..404c27e24 100644 --- a/kicker/taskbar/taskbarcontainer.cpp +++ b/kicker/taskbar/taskbarcontainer.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <layout.h> +#include <tqlayout.h> #include <tqtimer.h> #include <dcopclient.h> @@ -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(); } @@ -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 0bf40a2c7..7d0e4d3cd 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/kicker/taskbar/taskcontainer.cpp @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqpainter.h> #include <tqpixmap.h> #include <tqstyle.h> -#include <stylesheet.h> +#include <tqstylesheet.h> #include <tqtooltip.h> #include <kapplication.h> @@ -233,9 +233,9 @@ void TaskContainer::setLastActivated() void TaskContainer::animationTimerFired() { - if (!frames.isEmpty() && taskBar->showIcon() && frames.at(currentFrame) != frames.end()) + if (!frames.isEmpty() && taskBar->showIcon() && frames.tqat(currentFrame) != frames.end()) { - TQPixmap *pm = *frames.at(currentFrame); + TQPixmap *pm = *frames.tqat(currentFrame); // draw pixmap if ( pm && !pm->isNull() ) { @@ -315,7 +315,7 @@ void TaskContainer::resizeEvent( TQResizeEvent * ) { // calculate the icon rect TQRect br( tqstyle().subRect( TQStyle::SR_PushButtonContents, this ) ); - iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this ); + iconRect = TQStyle::tqvisualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this ); } void TaskContainer::add(Task::Ptr task) @@ -477,7 +477,7 @@ void TaskContainer::paintEvent( TQPaintEvent* ) } TQPainter p; - p.begin(pm ,this); + p.tqbegin(pm ,this); drawButton(&p); p.end(); @@ -533,7 +533,7 @@ void TaskContainer::drawButton(TQPainter *p) font.setBold(active); - TQColorGroup colors = palette().active(); + TQColorGroup colors = tqpalette().active(); if (TaskBarSettings::useCustomColors()) { @@ -583,8 +583,8 @@ void TaskContainer::drawButton(TQPainter *p) bool sunken = isDown() || (alwaysDrawButtons && (active || aboutToActivate)); bool reverse = TQApplication::reverseLayout(); TQRect br(tqstyle().subRect(TQStyle::SR_PushButtonContents, this)); - TQPoint shift = TQPoint(tqstyle().pixelMetric(TQStyle::PM_ButtonShiftHorizontal), - tqstyle().pixelMetric(TQStyle::PM_ButtonShiftVertical)); + TQPoint shift = TQPoint(tqstyle().tqpixelMetric(TQStyle::PM_ButtonShiftHorizontal), + tqstyle().tqpixelMetric(TQStyle::PM_ButtonShiftVertical)); // draw button background if (drawButton) @@ -653,7 +653,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); @@ -670,7 +670,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; @@ -736,7 +736,7 @@ void TaskContainer::drawButton(TQPainter *p) TQPaintDevice* opd = p->device(); p->end(); pm->convertFromImage(img); - p->begin(opd ,this); + p->tqbegin(opd ,this); } else { @@ -754,9 +754,9 @@ void TaskContainer::drawButton(TQPainter *p) } } - if (!frames.isEmpty() && m_startup && frames.at(currentFrame) != frames.end()) + if (!frames.isEmpty() && m_startup && frames.tqat(currentFrame) != frames.end()) { - TQPixmap *anim = *frames.at(currentFrame); + TQPixmap *anim = *frames.tqat(currentFrame); if (anim && !anim->isNull()) { @@ -787,7 +787,7 @@ void TaskContainer::drawButton(TQPainter *p) } int flags = TQStyle::Style_Enabled; - TQRect ar = TQStyle::visualRect(TQRect(br.x() + br.width() - 8 - 2, + TQRect ar = TQStyle::tqvisualRect(TQRect(br.x() + br.width() - 8 - 2, br.y(), 8, br.height()), this); if (sunken) { @@ -799,7 +799,7 @@ void TaskContainer::drawButton(TQPainter *p) // draw mouse over frame in transparent mode if (m_mouseOver && halo) - KickerLib::drawBlendedRect(p, TQRect(0, 0, width(), height()), colorGroup().foreground()); + KickerLib::drawBlendedRect(p, TQRect(0, 0, width(), height()), tqcolorGroup().foreground()); if (aboutToActivate) { @@ -830,13 +830,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) { @@ -856,7 +856,7 @@ TQString TaskContainer::name() } // strip trailing crap - while (i > 0 && !match.at(i).isLetterOrNumber()) + while (i > 0 && !match.tqat(i).isLetterOrNumber()) { --i; } @@ -1161,17 +1161,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; diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp index 4eab82bc1..af7f6e854 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) @@ -213,7 +213,7 @@ void TaskLMBMenu::dragMoveEvent( TQDragMoveEvent* e ) void TaskLMBMenu::dragSwitch() { bool ok = false; - Task::Ptr t = m_tasks.at(indexOf(m_lastDragId), &ok); + Task::Ptr t = m_tasks.tqat(indexOf(m_lastDragId), &ok); if (ok) { t->activate(); @@ -264,7 +264,7 @@ void TaskLMBMenu::mouseMoveEvent(TQMouseEvent* e) if (index != -1) { bool ok = false; - Task::Ptr task = m_tasks.at(index, &ok); + Task::Ptr task = m_tasks.tqat(index, &ok); if (ok) { Task::List tasks; diff --git a/kicker/taskmanager/tasklmbmenu.h b/kicker/taskmanager/tasklmbmenu.h index 7eedc115b..973cf666f 100644 --- a/kicker/taskmanager/tasklmbmenu.h +++ b/kicker/taskmanager/tasklmbmenu.h @@ -38,7 +38,7 @@ public: ~TaskMenuItem(); void paint(TQPainter*, const TQColorGroup&, bool, bool, int, int, int, int); - TQSize sizeHint(); + TQSize tqsizeHint(); void setAttentionState(bool state) { m_attentionState = state; } private: diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp index 6f84efae4..f6cff4248 100644 --- a/kicker/taskmanager/taskmanager.cpp +++ b/kicker/taskmanager/taskmanager.cpp @@ -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()) |