diff options
Diffstat (limited to 'kicker')
250 files changed, 1817 insertions, 1905 deletions
diff --git a/kicker/HACKING b/kicker/HACKING index c03925cdc..12f48652d 100644 --- a/kicker/HACKING +++ b/kicker/HACKING @@ -3,10 +3,10 @@ The Short Story Four space tabs, braces on their own lines, 80 character lines. Code should look something like this: -QString ExtensionManager::uniqueId() +TQString ExtensionManager::uniqueId() { - QString idBase = "Extension_%1"; - QString newId; + TQString idBase = "Extension_%1"; + TQString newId; int i = 0; bool unique = false; @@ -255,7 +255,7 @@ from tight loops or is in a hot path) or if it is a simple, one-liner setter/getter method. Otherwise methods should be implemented outside of the class definition. -[1] macros include things like Q_OBJECT and K_DCOP. the should ONLY appear in +[1] macros include things like TQ_OBJECT and K_DCOP. the should ONLY appear in files where they are actually necessary and not just randomly thrown in there for fun. ;-) diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index 86ee8b059..7cbb5a6c8 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -84,7 +84,7 @@ TDEConfigDialogSingle::TDEConfigDialogSingle(Zone *zone, TQWidget *parent, setIcon(SmallIcon("date")); settings = new SettingsWidgetImp(prefs, zone, 0, "General"); - connect(TQT_TQOBJECT(settings->kcfg_Type), TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int))); + connect(settings->kcfg_Type, TQ_SIGNAL(activated(int)), TQ_SLOT(selectPage(int))); settings->kcfg_PlainBackgroundColor->setDefaultColor(TDEApplication::palette().active().background()); settings->kcfg_DateBackgroundColor->setDefaultColor(TDEApplication::palette().active().background()); @@ -104,24 +104,24 @@ TDEConfigDialogSingle::TDEConfigDialogSingle(Zone *zone, TQWidget *parent, settings->widgetStack->addWidget(fuzzyPage, 3); fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(TDEApplication::palette().active().background()); - connect(TQT_TQOBJECT(settings->kcfg_PlainShowDate), TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); - connect(TQT_TQOBJECT(settings->kcfg_PlainShowDayOfWeek), TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); - connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDate), TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); - connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDayOfWeek), TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); - connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDate), TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); - connect(TQT_TQOBJECT(analogPage->kcfg_AnalogShowDate), TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); - connect(TQT_TQOBJECT(analogPage->kcfg_AnalogShowDayOfWeek), TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); - connect(TQT_TQOBJECT(fuzzyPage->kcfg_FuzzyShowDate), TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); - connect(TQT_TQOBJECT(fuzzyPage->kcfg_FuzzyShowDayOfWeek), TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); + connect(settings->kcfg_PlainShowDate, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); + connect(settings->kcfg_PlainShowDayOfWeek, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); + connect(digitalPage->kcfg_DigitalShowDate, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); + connect(digitalPage->kcfg_DigitalShowDayOfWeek, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); + connect(digitalPage->kcfg_DigitalShowDate, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); + connect(analogPage->kcfg_AnalogShowDate, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); + connect(analogPage->kcfg_AnalogShowDayOfWeek, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); + connect(fuzzyPage->kcfg_FuzzyShowDate, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); + connect(fuzzyPage->kcfg_FuzzyShowDayOfWeek, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); addPage(settings, i18n("General"), TQString::fromLatin1("package_settings")); } @@ -144,7 +144,7 @@ void TDEConfigDialogSingle::updateWidgetsDefault() item->swapDefault(); // This is ugly, but kcfg_Type does not have its correct setting // at this point in time. - TQTimer::singleShot(0, this, TQT_SLOT(dateToggled())); + TQTimer::singleShot(0, this, TQ_SLOT(dateToggled())); } void TDEConfigDialogSingle::selectPage(int p) @@ -425,7 +425,7 @@ void DigitalClock::drawContents( TQPainter * p) p->translate( +1, +1 ); TQLCDNumber::drawContents( p ); if (_prefs->digitalLCDStyle()) - pal.setColor( TQColorGroup::Foreground, Qt::black); + pal.setColor( TQColorGroup::Foreground, TQt::black); else pal.setColor( TQColorGroup::Foreground, _prefs->digitalForegroundColor()); setPalette( pal ); @@ -633,8 +633,8 @@ void AnalogClock::paintEvent( TQPaintEvent * ) } if (_prefs->analogLCDStyle()) { - paint.setPen( TQPen(Qt::black, aaFactor) ); - paint.setBrush( Qt::black ); + paint.setPen( TQPen(TQt::black, aaFactor) ); + paint.setBrush( TQt::black ); } else { paint.setPen( TQPen(_prefs->analogForegroundColor(), aaFactor) ); paint.setBrush( _prefs->analogForegroundColor() ); @@ -743,7 +743,7 @@ FuzzyClock::FuzzyClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent, cons void FuzzyClock::deleteMyself() { if(alreadyDrawing) // try again later - TQTimer::singleShot(1000, this, TQT_SLOT(deleteMyself())); + TQTimer::singleShot(1000, this, TQ_SLOT(deleteMyself())); else delete this; } @@ -854,7 +854,7 @@ void FuzzyClock::drawContents(TQPainter *p) TQRect tr; - if (_applet->getOrientation() == Qt::Vertical) + if (_applet->getOrientation() == TQt::Vertical) { p->rotate(90); tr = TQRect(4, -2, height() - 8, -(width()) + 2); @@ -917,9 +917,9 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions, _date->setBackgroundOrigin(AncestorOrigin); _date->installEventFilter(this); // catch mouse clicks - connect(m_layoutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fixupLayout())); - connect(_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdate())); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(globalPaletteChange())); + connect(m_layoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fixupLayout())); + connect(_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotUpdate())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(globalPaletteChange())); reconfigure(); // initialize clock widget slotUpdate(); @@ -927,8 +927,8 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions, if (kapp->authorizeTDEAction("kicker_rmb")) { menu = new TDEPopupMenu(); - connect(menu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShowContextMenu())); - connect(menu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); + connect(menu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShowContextMenu())); + connect(menu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int))); setCustomMenu(menu); } @@ -970,7 +970,7 @@ KTextShadowEngine *ClockApplet::shadowEngine() int ClockApplet::widthForHeight(int h) const { - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { return width(); } @@ -1081,7 +1081,7 @@ int ClockApplet::widthForHeight(int h) const int ClockApplet::heightForWidth(int w) const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return height(); } @@ -1156,7 +1156,7 @@ void ClockApplet::preferences(bool timezone) if (!dialog) { dialog = new TDEConfigDialogSingle(zone, this, configFileName, _prefs, KDialogBase::Swallow); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotReconfigure())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotReconfigure())); } if (timezone) @@ -1242,7 +1242,7 @@ void ClockApplet::reconfigure() m_updateOnTheMinute = updateInterval != shortInterval; if (m_updateOnTheMinute) { - connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60())); + connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTimerTo60())); updateInterval = ((60 - clockGetTime().second()) * 1000) + 500; } else @@ -1250,7 +1250,7 @@ void ClockApplet::reconfigure() // in case we reconfigure to show seconds but setTimerTo60 is going to be called // we need to make sure to disconnect this so we don't end up updating only once // a minute ;) - disconnect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60())); + disconnect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTimerTo60())); } _timer->start(updateInterval); @@ -1300,7 +1300,7 @@ void ClockApplet::reconfigure() void ClockApplet::setTimerTo60() { // kdDebug() << "setTimerTo60" << endl; - disconnect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60())); + disconnect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTimerTo60())); _timer->changeInterval(60000); } @@ -1417,7 +1417,7 @@ void ClockApplet::slotUpdate() if (seconds > 2) { - connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60())); + connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTimerTo60())); _timer->changeInterval(((60 - seconds) * 1000) + 500); } } @@ -1430,7 +1430,7 @@ void ClockApplet::slotCalendarDeleted() _calendar = 0L; // don't reopen the calendar immediately ... _disableCalendar = true; - TQTimer::singleShot(100, this, TQT_SLOT(slotEnableCalendar())); + TQTimer::singleShot(100, this, TQ_SLOT(slotEnableCalendar())); // we are free to show a tip know :) installEventFilter(KickerTip::the()); @@ -1460,7 +1460,7 @@ void ClockApplet::toggleCalendar() removeEventFilter(KickerTip::the()); _calendar = new DatePicker(this, _lastDate, _prefs); - connect(_calendar, TQT_SIGNAL(destroyed()), TQT_SLOT(slotCalendarDeleted())); + connect(_calendar, TQ_SIGNAL(destroyed()), TQ_SLOT(slotCalendarDeleted())); TQSize size = _prefs->calendarSize(); @@ -1542,24 +1542,24 @@ void ClockApplet::aboutToShowContextMenu() TDELocale *loc = TDEGlobal::locale(); TQDateTime dt = TQDateTime::currentDateTime(); - dt = TQT_TQDATETIME_OBJECT(dt.addSecs(TZoffset)); + dt = dt.addSecs(TZoffset); TDEPopupMenu *copyMenu = new TDEPopupMenu( menu ); copyMenu->insertItem(loc->formatDateTime(dt), 201); - copyMenu->insertItem(loc->formatDate(TQT_TQDATE_OBJECT(dt.date())), 202); - copyMenu->insertItem(loc->formatDate(TQT_TQDATE_OBJECT(dt.date()), true), 203); - copyMenu->insertItem(loc->formatTime(TQT_TQTIME_OBJECT(dt.time())), 204); - copyMenu->insertItem(loc->formatTime(TQT_TQTIME_OBJECT(dt.time()), true), 205); + copyMenu->insertItem(loc->formatDate(dt.date()), 202); + copyMenu->insertItem(loc->formatDate(dt.date(), true), 203); + copyMenu->insertItem(loc->formatTime(dt.time()), 204); + copyMenu->insertItem(loc->formatTime(dt.time(), true), 205); copyMenu->insertItem(dt.date().toString(), 206); copyMenu->insertItem(dt.time().toString(), 207); copyMenu->insertItem(dt.toString(), 208); copyMenu->insertItem(dt.toString("yyyy-MM-dd hh:mm:ss"), 209); - connect( copyMenu, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotCopyMenuActivated(int) ) ); + connect( copyMenu, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotCopyMenuActivated(int) ) ); if (!bImmutable) { TDEPopupMenu *zoneMenu = new TDEPopupMenu( menu ); - connect(zoneMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); + connect(zoneMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int))); for (int i = 0; i <= zone->remoteZoneCount(); i++) { if (i == 0) @@ -1576,7 +1576,7 @@ void ClockApplet::aboutToShowContextMenu() zoneMenu->insertItem(SmallIcon("configure"), i18n("&Configure Timezones..."), 110); TDEPopupMenu *type_menu = new TDEPopupMenu(menu); - connect(type_menu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); + connect(type_menu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int))); type_menu->insertItem(i18n("&Plain"), Prefs::EnumType::Plain, 1); type_menu->insertItem(i18n("&Digital"), Prefs::EnumType::Digital, 2); type_menu->insertItem(i18n("&Analog"), Prefs::EnumType::Analog, 3); @@ -1610,12 +1610,12 @@ void ClockApplet::slotCopyMenuActivated( int id ) TQTime ClockApplet::clockGetTime() { - return TQT_TQTIME_OBJECT(TQTime::currentTime().addSecs(TZoffset)); + return TQTime::currentTime().addSecs(TZoffset); } TQDate ClockApplet::clockGetDate() { - return TQT_TQDATE_OBJECT(TQDateTime::currentDateTime().addSecs(TZoffset).date()); + return TQDateTime::currentDateTime().addSecs(TZoffset).date(); } void ClockApplet::showZone(int z) @@ -1642,13 +1642,13 @@ void ClockApplet::mousePressEvent(TQMouseEvent *ev) { switch (ev->button()) { - case Qt::LeftButton: + case TQt::LeftButton: toggleCalendar(); break; - case Qt::RightButton: + case TQt::RightButton: openContextMenu(); break; - case Qt::MidButton: + case TQt::MidButton: nextZone(); TQToolTip::remove(_clock->widget()); break; @@ -1675,10 +1675,10 @@ void ClockApplet::wheelEvent(TQWheelEvent* e) // catch the mouse clicks of our child widgets bool ClockApplet::eventFilter( TQObject *o, TQEvent *e ) { - if (( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_clock->widget()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_date) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_dayOfWeek)) && + if (( o == _clock->widget() || o == _date || o == _dayOfWeek) && e->type() == TQEvent::MouseButtonPress ) { - mousePressEvent(TQT_TQMOUSEEVENT(e) ); + mousePressEvent(static_cast<TQMouseEvent*>(e) ); return true; } @@ -1794,7 +1794,7 @@ void ClockApplet::fixupLayout() // this fixes problems triggered by having the date first // because of the date format (e.g. YY/MM/DD) and then hiding // the date - if (orientation() == Qt::Horizontal && height() < 32) + if (orientation() == TQt::Horizontal && height() < 32) { bool mustShowDate = showDate || (zone->zoneIndex() != 0); @@ -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 = TDEGlobal::locale()->formatDateTime(TQT_TQDATETIME_OBJECT(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset))); + tipText = TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset)); } else { diff --git a/kicker/applets/clock/clock.h b/kicker/applets/clock/clock.h index 36e5f00bf..9f4031539 100644 --- a/kicker/applets/clock/clock.h +++ b/kicker/applets/clock/clock.h @@ -66,7 +66,7 @@ class SettingsWidgetImp; class SettingsWidgetImp : public SettingsWidget { - Q_OBJECT + TQ_OBJECT public: SettingsWidgetImp(Prefs *p=0, @@ -84,7 +84,7 @@ class SettingsWidgetImp : public SettingsWidget class TDEConfigDialogSingle : public TDEConfigDialog { - Q_OBJECT + TQ_OBJECT public: TDEConfigDialogSingle(Zone *zone, @@ -139,7 +139,7 @@ class ClockWidget class PlainClock : public TQLabel, public ClockWidget { - Q_OBJECT + TQ_OBJECT public: PlainClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent=0, const char *name=0); @@ -162,7 +162,7 @@ class PlainClock : public TQLabel, public ClockWidget class DigitalClock : public TQLCDNumber, public ClockWidget { - Q_OBJECT + TQ_OBJECT public: DigitalClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent=0, const char *name=0); @@ -189,7 +189,7 @@ class DigitalClock : public TQLCDNumber, public ClockWidget class AnalogClock : public TQFrame, public ClockWidget { - Q_OBJECT + TQ_OBJECT public: AnalogClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent=0, const char *name=0); @@ -216,7 +216,7 @@ class AnalogClock : public TQFrame, public ClockWidget class FuzzyClock : public TQFrame, public ClockWidget { - Q_OBJECT + TQ_OBJECT public: FuzzyClock(ClockApplet *applet, Prefs* prefs, TQWidget *parent=0, const char *name=0); @@ -260,7 +260,7 @@ class ClockAppletToolTip : public TQToolTip class ClockApplet : public KPanelApplet, public KickerTip::Client, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP friend class ClockAppletToolTip; diff --git a/kicker/applets/clock/datepicker.cpp b/kicker/applets/clock/datepicker.cpp index d6165306e..99b9fe33e 100644 --- a/kicker/applets/clock/datepicker.cpp +++ b/kicker/applets/clock/datepicker.cpp @@ -69,7 +69,7 @@ void DatePicker::keyPressEvent(TQKeyEvent *e) { TQVBox::keyPressEvent(e); - if (e->key() == Qt::Key_Escape) + if (e->key() == TQt::Key_Escape) { close(); } diff --git a/kicker/applets/clock/digital.ui b/kicker/applets/clock/digital.ui index e8ced7f2d..c63eb7d32 100644 --- a/kicker/applets/clock/digital.ui +++ b/kicker/applets/clock/digital.ui @@ -293,9 +293,9 @@ <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">tdefontrequester.h</include> </includes> -<Q_SLOTS> +<slots> <slot>kcfg_DigitalLCDStyle_stateChanged( int )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui index 81e126560..bd33473cd 100644 --- a/kicker/applets/clock/settings.ui +++ b/kicker/applets/clock/settings.ui @@ -509,9 +509,9 @@ <include location="global" impldecl="in implementation">tdefontrequester.h</include> <include location="global" impldecl="in implementation">tdelistview.h</include> </includes> -<Q_SLOTS> +<slots> <slot>configureType()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp index aa9126b8c..85a4f3f19 100644 --- a/kicker/applets/clock/zone.cpp +++ b/kicker/applets/clock/zone.cpp @@ -85,7 +85,7 @@ int Zone::calc_TZ_offset(const TQString& zone, bool /* reset */) if (z) { - return -z->offset(Qt::LocalTime); + return -z->offset(TQt::LocalTime); } return 0; diff --git a/kicker/applets/launcher/configdlg.cpp b/kicker/applets/launcher/configdlg.cpp index d542d2593..88301b7cf 100644 --- a/kicker/applets/launcher/configdlg.cpp +++ b/kicker/applets/launcher/configdlg.cpp @@ -47,8 +47,8 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, Prefs *config, m_ui->iconDim->insertItem(TQString::number( m_settings->iconDimChoices()[n])); } - connect(m_ui->iconDim, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(updateButtons())); + connect(m_ui->iconDim, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(updateButtons())); updateWidgets(); m_oldIconDimText = m_ui->iconDim->currentText(); updateButtons(); diff --git a/kicker/applets/launcher/configdlg.h b/kicker/applets/launcher/configdlg.h index b96caf459..14fda2cac 100644 --- a/kicker/applets/launcher/configdlg.h +++ b/kicker/applets/launcher/configdlg.h @@ -31,7 +31,7 @@ class Prefs; class ConfigDlg : public TDEConfigDialog { - Q_OBJECT + TQ_OBJECT public: ConfigDlg(TQWidget *parent, const char *name, Prefs *config, int autoSize, diff --git a/kicker/applets/launcher/flowgridmanager.cpp b/kicker/applets/launcher/flowgridmanager.cpp index 46c79a857..5172b4eee 100644 --- a/kicker/applets/launcher/flowgridmanager.cpp +++ b/kicker/applets/launcher/flowgridmanager.cpp @@ -17,7 +17,7 @@ FlowGridManager::FlowGridManager(TQSize p_item_size, TQSize p_space_size, TQSize p_border_size, TQSize p_frame_size, - Qt::Orientation orient, + TQt::Orientation orient, int num_items, Slack slack_x,Slack slack_y) { @@ -65,15 +65,15 @@ void FlowGridManager::setFrameSize(TQSize p_frame_size) return; _pFrameSize=p_frame_size; if (_pFrameSize.width()<=0) { - _orientation=Qt::Vertical; + _orientation=TQt::Vertical; } if (_pFrameSize.height()<=0) { - _orientation=Qt::Horizontal; + _orientation=TQt::Horizontal; } _dirty=true; } -void FlowGridManager::setOrientation(Qt::Orientation orient) +void FlowGridManager::setOrientation(TQt::Orientation orient) { if (orient==_orientation) return; _orientation=orient; _dirty=true; @@ -114,7 +114,7 @@ TQSize FlowGridManager::frameSize() const TQPoint FlowGridManager::origin() const { _checkReconfigure(); return _origin;} -Qt::Orientation FlowGridManager::orientation() const +TQt::Orientation FlowGridManager::orientation() const { _checkReconfigure(); return _orientation;} /*Slack FlowGridManager::slackX() const @@ -154,7 +154,7 @@ TQPoint FlowGridManager::cell(int index) const // return height if orientation is Horizontal // return width if orientation is Vertical int FlowGridManager::_getHH(TQSize size) const -{ if (_orientation==Qt::Horizontal) +{ if (_orientation==TQt::Horizontal) return size.height(); return size.width(); } @@ -162,14 +162,14 @@ int FlowGridManager::_getHH(TQSize size) const // return height if orientation is Vertical // return width if orientation is Horizontal int FlowGridManager::_getWH(TQSize size) const -{ if (_orientation==Qt::Horizontal) +{ if (_orientation==TQt::Horizontal) return size.width(); return size.height(); } // swap horizontal and vertical if orientation is Vertical, otherwise return arg TQSize FlowGridManager::_swapHV(TQSize hv) const -{ if (_orientation==Qt::Horizontal) +{ if (_orientation==TQt::Horizontal) return hv; TQSize temp=hv; temp.transpose(); diff --git a/kicker/applets/launcher/flowgridmanager.h b/kicker/applets/launcher/flowgridmanager.h index c801431b4..228210884 100644 --- a/kicker/applets/launcher/flowgridmanager.h +++ b/kicker/applets/launcher/flowgridmanager.h @@ -26,7 +26,7 @@ public: TQSize p_space_size=TQSize(0,0), TQSize p_border_size=TQSize(0,0), TQSize frame_size=TQSize(0,0), - Qt::Orientation orient=Qt::Horizontal, + TQt::Orientation orient=TQt::Horizontal, int num_items=0, Slack slack_x=ItemSlack, Slack slack_y=ItemSlack); @@ -36,7 +36,7 @@ public: void setItemSize(TQSize item_size); void setSpaceSize(TQSize space_size); void setBorderSize(TQSize border_size); - void setOrientation(Qt::Orientation orient); + void setOrientation(TQt::Orientation orient); void setFrameSize(TQSize frame_size); void setSlack(Slack slack_x, Slack slack_y); void setConserveSpace(bool conserve); @@ -49,7 +49,7 @@ public: TQSize gridSpacing() const; TQSize frameSize() const; TQPoint origin() const; - Qt::Orientation orientation() const; + TQt::Orientation orientation() const; bool conserveSpace() const; // Slack slackX() const; @@ -76,7 +76,7 @@ protected: TQSize _pItemSize,_pSpaceSize,_pBorderSize,_pFrameSize; Slack _slackX, _slackY; bool _conserveSpace; - Qt::Orientation _orientation; + TQt::Orientation _orientation; int _numItems; // results diff --git a/kicker/applets/launcher/quickaddappsmenu.cpp b/kicker/applets/launcher/quickaddappsmenu.cpp index cdbc94dd5..bf496e028 100644 --- a/kicker/applets/launcher/quickaddappsmenu.cpp +++ b/kicker/applets/launcher/quickaddappsmenu.cpp @@ -38,8 +38,8 @@ QuickAddAppsMenu::QuickAddAppsMenu(const TQString &label, const TQString &relPat { _targetObject = target; _sender = sender; - connect(this, TQT_SIGNAL(addAppBefore(TQString,TQString)), - target, TQT_SLOT(addAppBeforeManually(TQString,TQString))); + connect(this, TQ_SIGNAL(addAppBefore(TQString,TQString)), + target, TQ_SLOT(addAppBeforeManually(TQString,TQString))); } QuickAddAppsMenu::QuickAddAppsMenu(TQWidget *target, TQWidget *parent, const TQString &sender, const char *name) @@ -47,8 +47,8 @@ QuickAddAppsMenu::QuickAddAppsMenu(TQWidget *target, TQWidget *parent, const TQS { _targetObject = target; _sender = sender; - connect(this, TQT_SIGNAL(addAppBefore(TQString,TQString)), - target, TQT_SLOT(addAppBeforeManually(TQString,TQString))); + connect(this, TQ_SIGNAL(addAppBefore(TQString,TQString)), + target, TQ_SLOT(addAppBeforeManually(TQString,TQString))); } void QuickAddAppsMenu::slotExec(int id) diff --git a/kicker/applets/launcher/quickaddappsmenu.h b/kicker/applets/launcher/quickaddappsmenu.h index 01c185181..b5bab8bfc 100644 --- a/kicker/applets/launcher/quickaddappsmenu.h +++ b/kicker/applets/launcher/quickaddappsmenu.h @@ -29,7 +29,7 @@ s #include "service_mnu.h" class QuickAddAppsMenu: public PanelServiceMenu { - Q_OBJECT + TQ_OBJECT public: QuickAddAppsMenu(const TQString &label, const TQString &relPath, TQWidget *target, TQWidget *parent=0, const char *name=0, const TQString &sender=TQString("")); QuickAddAppsMenu(TQWidget *target, TQWidget *parent=0, const TQString &sender=TQString(""), const char *name=0); diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp index 19377c1b4..2b09dac34 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/kicker/applets/launcher/quickbutton.cpp @@ -138,7 +138,7 @@ TQPixmap QuickURL::pixmap( mode_t _mode, TDEIcon::Group _group, pxmap = KMimeType::pixmapForURL(_kurl, _mode, _group, _force_size, _state); } // Resize to fit button - pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, TQ_ScaleMin)); + pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, TQImage::ScaleMin)); return pxmap; } @@ -158,7 +158,7 @@ QuickButton::QuickButton(const TQString &u, TDEAction* configAction, if (_qurl->url() == "SPECIAL_BUTTON__SHOW_DESKTOP") { setToggleButton(true); setOn( ShowDesktop::the()->desktopShowing() ); - connect( ShowDesktop::the(), TQT_SIGNAL(desktopShown(bool)), this, TQT_SLOT(toggle(bool)) ); + connect( ShowDesktop::the(), TQ_SIGNAL(desktopShown(bool)), this, TQ_SLOT(toggle(bool)) ); } TQToolTip::add(this, _qurl->name()); @@ -172,18 +172,18 @@ QuickButton::QuickButton(const TQString &u, TDEAction* configAction, configAction->plug(_popup); _popup->insertSeparator(); _popup->insertItem(SmallIcon("remove"), i18n("Remove Application"), - this, TQT_SLOT(removeApp())); + this, TQ_SLOT(removeApp())); m_stickyAction = new TDEToggleAction(i18n("Never Remove Automatically"), - TDEShortcut(), TQT_TQOBJECT(this)); - connect(m_stickyAction, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotStickyToggled(bool))); + TDEShortcut(), this); + connect(m_stickyAction, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotStickyToggled(bool))); m_stickyAction->plug(_popup, 2); m_stickyId = _popup->idAt(2); - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(launch())); - connect(this, TQT_SIGNAL(removeApp(QuickButton *)), parent, - TQT_SLOT(removeAppManually(QuickButton *))); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(launch())); + connect(this, TQ_SIGNAL(removeApp(QuickButton *)), parent, + TQ_SLOT(removeAppManually(QuickButton *))); } QuickButton::~QuickButton() @@ -219,9 +219,9 @@ void QuickButton::resizeEvent(TQResizeEvent *e) void QuickButton::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) _popup->popup(e->globalPos()); - else if (e->button() == Qt::LeftButton) { + else if (e->button() == TQt::LeftButton) { _dragPos = e->pos(); TQButton::mousePressEvent(e); } @@ -229,7 +229,7 @@ void QuickButton::mousePressEvent(TQMouseEvent *e) void QuickButton::mouseMoveEvent(TQMouseEvent *e) { - if ((e->state() & Qt::LeftButton) == 0) return; + if ((e->state() & TQt::LeftButton) == 0) return; TQPoint p(e->pos() - _dragPos); if (p.manhattanLength() <= TDEGlobalSettings::dndEventDelay()) return; @@ -246,7 +246,7 @@ void QuickButton::mouseMoveEvent(TQMouseEvent *e) dd->drag(); releaseKeyboard(); } else { - setCursor(Qt::ForbiddenCursor); + setCursor(TQt::ForbiddenCursor); } } @@ -303,7 +303,7 @@ void QuickButton::removeApp() void QuickButton::flash() { m_flashCounter = 2000; - TQTimer::singleShot(0, this, TQT_SLOT(slotFlash())); + TQTimer::singleShot(0, this, TQ_SLOT(slotFlash())); } void QuickButton::slotFlash() @@ -314,7 +314,7 @@ void QuickButton::slotFlash() m_flashCounter -= timeout; if (m_flashCounter < 0) m_flashCounter = 0; update(); - TQTimer::singleShot(timeout, this, TQT_SLOT(slotFlash())); + TQTimer::singleShot(timeout, this, TQ_SLOT(slotFlash())); } } diff --git a/kicker/applets/launcher/quickbutton.h b/kicker/applets/launcher/quickbutton.h index ea5ed21aa..ebb967def 100644 --- a/kicker/applets/launcher/quickbutton.h +++ b/kicker/applets/launcher/quickbutton.h @@ -66,7 +66,7 @@ private: class QuickButton: public SimpleButton, public KickerTip::Client { - Q_OBJECT + TQ_OBJECT public: enum { DEFAULT_ICON_DIM = 16 }; diff --git a/kicker/applets/launcher/quickbuttongroup.h b/kicker/applets/launcher/quickbuttongroup.h index 1c153d85c..d45480542 100644 --- a/kicker/applets/launcher/quickbuttongroup.h +++ b/kicker/applets/launcher/quickbuttongroup.h @@ -28,7 +28,7 @@ public: }; QuickButtonGroup::Index QuickButtonGroup::findDescriptor(const TQString &desc) -{ return findProperty(desc, std::mem_fun(&QuickButton::url));} +{ return findProperty(desc, std::mem_fn(&QuickButton::url));} inline void QuickButtonGroup::setUpdatesEnabled(bool enable) { for (QuickButtonGroup::iterator i=begin();i!=end();++i) { @@ -38,16 +38,16 @@ inline void QuickButtonGroup::setUpdatesEnabled(bool enable) } inline void QuickButtonGroup::show() -{ std::for_each(begin(),end(),std::mem_fun(&TQWidget::show));} +{ std::for_each(begin(),end(),std::mem_fn(&TQWidget::show));} inline void QuickButtonGroup::hide() -{ std::for_each(begin(),end(),std::mem_fun(&TQWidget::hide));} +{ std::for_each(begin(),end(),std::mem_fn(&TQWidget::hide));} inline void QuickButtonGroup::setDragging(bool drag) -{ std::for_each(begin(),end(),std::bind2nd(std::mem_fun(&QuickButton::setDragging),drag));} +{ std::for_each(begin(),end(),std::bind(std::mem_fn(&QuickButton::setDragging),std::placeholders::_1,drag));} inline void QuickButtonGroup::setEnableDrag(bool enable) -{ std::for_each(begin(),end(),std::bind2nd(std::mem_fun(&QuickButton::setEnableDrag),enable));} +{ std::for_each(begin(),end(),std::bind(std::mem_fn(&QuickButton::setEnableDrag),std::placeholders::_1,enable));} inline void QuickButtonGroup::deleteContents() { for (QuickButtonGroup::iterator i=begin();i!=end();++i) { diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp index 1ee251b36..3f0ee88a8 100644 --- a/kicker/applets/launcher/quicklauncher.cpp +++ b/kicker/applets/launcher/quicklauncher.cpp @@ -108,10 +108,10 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions, m_dragButtons = 0; m_configAction = new TDEAction(i18n("Configure Quicklauncher..."), "configure", TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), TQT_TQOBJECT(this)); + this, TQ_SLOT(slotConfigure()), this); m_saveTimer = new TQTimer(this, "m_saveTimer"); - connect(m_saveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(saveConfig())); + connect(m_saveTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(saveConfig())); m_popularity = new PopularityStatistics(); @@ -168,15 +168,15 @@ void QuickLauncher::buildPopupMenu() m_appletPopup = new TQPopupMenu(this); m_appletPopup->insertItem(i18n("Add Application"), addAppsMenu); m_removeAppsMenu = new TQPopupMenu(this); - connect(m_removeAppsMenu, TQT_SIGNAL(aboutToShow()), - TQT_SLOT(fillRemoveAppsMenu())); - connect(m_removeAppsMenu, TQT_SIGNAL(activated(int)), - TQT_SLOT(removeAppManually(int))); + connect(m_removeAppsMenu, TQ_SIGNAL(aboutToShow()), + TQ_SLOT(fillRemoveAppsMenu())); + connect(m_removeAppsMenu, TQ_SIGNAL(activated(int)), + TQ_SLOT(removeAppManually(int))); m_appletPopup->insertItem(i18n("Remove Application"), m_removeAppsMenu); m_appletPopup->insertSeparator(); m_appletPopup->setCheckable( true ); - m_appletPopup->insertItem(i18n("About"), this, TQT_SLOT(about())); + m_appletPopup->insertItem(i18n("About"), this, TQ_SLOT(about())); setCustomMenu(m_appletPopup); } @@ -235,8 +235,8 @@ void QuickLauncher::slotConfigure() m_configDialog = new ConfigDlg(this, "configdialog", m_settings, SIZE_AUTO, KDialogBase::Plain, KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Apply | KDialogBase::Default); - connect(m_configDialog, TQT_SIGNAL(settingsChanged()), - this, TQT_SLOT(slotSettingsDialogChanged())); + connect(m_configDialog, TQ_SIGNAL(settingsChanged()), + this, TQ_SLOT(slotSettingsDialogChanged())); } m_configDialog->show(); @@ -338,7 +338,7 @@ int QuickLauncher::widthForHeight(int h) const { FlowGridManager temp_manager = *m_manager; temp_manager.setFrameSize(TQSize(h,h)); - temp_manager.setOrientation(Qt::Horizontal); // ??? probably not necessary + temp_manager.setOrientation(TQt::Horizontal); // ??? probably not necessary if (temp_manager.isValid()) { return temp_manager.frameSize().width(); @@ -351,7 +351,7 @@ int QuickLauncher::heightForWidth(int w) const { FlowGridManager temp_manager=*m_manager; temp_manager.setFrameSize(TQSize(w,w)); - temp_manager.setOrientation(Qt::Vertical); // ??? probably not necessary + temp_manager.setOrientation(TQt::Vertical); // ??? probably not necessary if (temp_manager.isValid()) { return temp_manager.frameSize().height(); @@ -362,7 +362,7 @@ int QuickLauncher::heightForWidth(int w) const int QuickLauncher::dimension() const { - if (orientation()==Qt::Vertical) + if (orientation()==TQt::Vertical) { return size().width(); } @@ -392,10 +392,10 @@ void QuickLauncher::addApp(TQString url, bool manuallyAdded) QuickButton* QuickLauncher::createButton(TQString url) { QuickButton* newButton=new QuickButton(url, m_configAction, this); - connect(newButton, TQT_SIGNAL(executed(TQString)), - this, TQT_SLOT(slotOwnServiceExecuted(TQString))); - connect(newButton, TQT_SIGNAL(stickyToggled(bool)), - this, TQT_SLOT(slotStickyToggled())); + connect(newButton, TQ_SIGNAL(executed(TQString)), + this, TQ_SLOT(slotOwnServiceExecuted(TQString))); + connect(newButton, TQ_SIGNAL(stickyToggled(bool)), + this, TQ_SLOT(slotStickyToggled())); newButton->setPopupDirection(popupDirection()); return newButton; } @@ -507,7 +507,7 @@ void QuickLauncher::about() void QuickLauncher::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) { m_popup->popup(e->globalPos()); } @@ -856,7 +856,7 @@ void QuickLauncher::loadConfig() int n = 0; while (iter != urls.end()) { TQString url = *iter; - addApp(url, n, false); + if(!url.isEmpty()) addApp(url, n, false); ++iter; ++n; } @@ -973,7 +973,7 @@ void QuickLauncher::serviceStartedByStorageId(TQString /*starter*/, TQString sto if (m_settings->autoAdjustEnabled()) { - TQTimer::singleShot(0, this, TQT_SLOT(slotAdjustToCurrentPopularity())); + TQTimer::singleShot(0, this, TQ_SLOT(slotAdjustToCurrentPopularity())); } } @@ -1047,7 +1047,7 @@ void QuickLauncher::slotOwnServiceExecuted(TQString serviceMenuId) m_popularity->useService(serviceMenuId); if (m_settings->autoAdjustEnabled()) { - TQTimer::singleShot(0, this, TQT_SLOT(slotAdjustToCurrentPopularity())); + TQTimer::singleShot(0, this, TQ_SLOT(slotAdjustToCurrentPopularity())); } } @@ -1077,7 +1077,7 @@ void QuickLauncher::updateStickyHighlightLayer() m_stickyHighlightLayer = TQImage(width(), height(), 32); m_stickyHighlightLayer.setAlphaBuffer(true); int pix, tlPix, brPix, w(width()), h(height()); - QRgb transparent(tqRgba(0, 0, 0, 0)); + TQRgb transparent(tqRgba(0, 0, 0, 0)); for (int y = h-1; y >= 0; --y) { for (int x = w-1; x >= 0; --x) diff --git a/kicker/applets/launcher/quicklauncher.h b/kicker/applets/launcher/quicklauncher.h index 2c47b602a..b6211f054 100644 --- a/kicker/applets/launcher/quicklauncher.h +++ b/kicker/applets/launcher/quicklauncher.h @@ -45,7 +45,7 @@ typedef QuickButtonGroup ButtonGroup; class QuickLauncher: public KPanelApplet, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP k_dcop: diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp index d4c14c9db..fcda62468 100644 --- a/kicker/applets/lockout/lockout.cpp +++ b/kicker/applets/lockout/lockout.cpp @@ -62,7 +62,7 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name //setFrameStyle(Panel | Sunken); setBackgroundOrigin( AncestorOrigin ); - if ( orientation() == Qt::Horizontal ) + if ( orientation() == TQt::Horizontal ) layout = new TQBoxLayout( this, TQBoxLayout::TopToBottom ); else layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight ); @@ -82,8 +82,8 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name bTransparent = conf->readBoolEntry( "Transparent", bTransparent ); - connect( lockButton, TQT_SIGNAL( clicked() ), TQT_SLOT( lock() )); - connect( logoutButton, TQT_SIGNAL( clicked() ), TQT_SLOT( logout() )); + connect( lockButton, TQ_SIGNAL( clicked() ), TQ_SLOT( lock() )); + connect( logoutButton, TQ_SIGNAL( clicked() ), TQ_SLOT( logout() )); lockButton->installEventFilter( this ); logoutButton->installEventFilter( this ); @@ -100,7 +100,7 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - connect( kapp, TQT_SIGNAL( iconChanged(int) ), TQT_SLOT( slotIconChanged() )); + connect( kapp, TQ_SIGNAL( iconChanged(int) ), TQ_SLOT( slotIconChanged() )); } Lockout::~Lockout() @@ -117,13 +117,13 @@ void Lockout::checkLayout( int height ) const TQBoxLayout::Direction direction = layout->direction(); if ( direction == TQBoxLayout::LeftToRight && - ( ( orientation() == Qt::Vertical && s.width() - 2 >= height ) || - ( orientation() == Qt::Horizontal && s.width() - 2 < height ) ) ) { + ( ( orientation() == TQt::Vertical && s.width() - 2 >= height ) || + ( orientation() == TQt::Horizontal && s.width() - 2 < height ) ) ) { layout->setDirection( TQBoxLayout::TopToBottom ); } else if ( direction == TQBoxLayout::TopToBottom && - ( ( orientation() == Qt::Vertical && s.height() - 2 < height ) || - ( orientation() == Qt::Horizontal && s.height() - 2 >= height ) ) ) { + ( ( orientation() == TQt::Vertical && s.height() - 2 < height ) || + ( orientation() == TQt::Horizontal && s.height() - 2 >= height ) ) ) { layout->setDirection( TQBoxLayout::LeftToRight ); } } @@ -193,25 +193,25 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e ) TDEConfig *conf = config(); conf->setGroup("lockout"); - TQMouseEvent *me = TQT_TQMOUSEEVENT( e ); - if( me->button() == Qt::RightButton ) + TQMouseEvent *me = static_cast<TQMouseEvent*>( e ); + if( me->button() == TQt::RightButton ) { - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lockButton) ) + if( o == lockButton ) { TQPopupMenu *popup = new TQPopupMenu(); popup->insertItem( SmallIcon( "system-lock-screen" ), i18n("Lock Session"), - this, TQT_SLOT( lock() ) ); + this, TQ_SLOT( lock() ) ); popup->insertSeparator(); i18n("&Transparent"); //popup->insertItem( i18n( "&Transparent" ), 100 ); popup->insertItem( SmallIcon( "configure" ), i18n( "&Configure Screen Saver..." ), - this, TQT_SLOT( slotLockPrefs() ) ); + this, TQ_SLOT( slotLockPrefs() ) ); //popup->setItemChecked( 100, bTransparent ); - //popup->connectItem(100, this, TQT_SLOT( slotTransparent() ) ); + //popup->connectItem(100, this, TQ_SLOT( slotTransparent() ) ); //if (conf->entryIsImmutable( "Transparent" )) // popup->setItemEnabled( 100, false ); popup->exec( me->globalPos() ); @@ -219,20 +219,20 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e ) return true; } - else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(logoutButton) ) + else if ( o == logoutButton ) { TQPopupMenu *popup = new TQPopupMenu(); popup->insertItem( SmallIcon( "system-log-out" ), i18n("&Log Out..."), - this, TQT_SLOT( logout() ) ); + this, TQ_SLOT( logout() ) ); popup->insertSeparator(); //popup->insertItem( i18n( "&Transparent" ), 100 ); popup->insertItem( SmallIcon( "configure" ), i18n( "&Configure Session Manager..." ), - this, TQT_SLOT( slotLogoutPrefs() ) ); + this, TQ_SLOT( slotLogoutPrefs() ) ); //popup->setItemChecked( 100, bTransparent ); - //popup->connectItem(100, this, TQT_SLOT( slotTransparent() ) ); + //popup->connectItem(100, this, TQ_SLOT( slotTransparent() ) ); //if (conf->entryIsImmutable( "Transparent" )) // popup->setItemEnabled( 100, false ); popup->exec( me->globalPos() ); diff --git a/kicker/applets/lockout/lockout.h b/kicker/applets/lockout/lockout.h index 6be995790..dd6428628 100644 --- a/kicker/applets/lockout/lockout.h +++ b/kicker/applets/lockout/lockout.h @@ -12,7 +12,7 @@ class TQToolButton; class Lockout : public KPanelApplet { - Q_OBJECT + TQ_OBJECT public: Lockout( const TQString& configFile, diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp index c3b964ce1..89f836492 100644 --- a/kicker/applets/media/mediaapplet.cpp +++ b/kicker/applets/media/mediaapplet.cpp @@ -57,18 +57,18 @@ MediaApplet::MediaApplet(const TQString& configFile, Type type, int actions, TQW mpDirLister = new KDirLister(); - connect( mpDirLister, TQT_SIGNAL( clear() ), - this, TQT_SLOT( slotClear() ) ); - connect( mpDirLister, TQT_SIGNAL( started(const KURL&) ), - this, TQT_SLOT( slotStarted(const KURL&) ) ); - connect( mpDirLister, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotCompleted() ) ); - connect( mpDirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ), - this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) ); - connect( mpDirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ), - this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) ); - connect( mpDirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ), - this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) ); + connect( mpDirLister, TQ_SIGNAL( clear() ), + this, TQ_SLOT( slotClear() ) ); + connect( mpDirLister, TQ_SIGNAL( started(const KURL&) ), + this, TQ_SLOT( slotStarted(const KURL&) ) ); + connect( mpDirLister, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotCompleted() ) ); + connect( mpDirLister, TQ_SIGNAL( newItems( const KFileItemList & ) ), + this, TQ_SLOT( slotNewItems( const KFileItemList & ) ) ); + connect( mpDirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ), + this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) ); + connect( mpDirLister, TQ_SIGNAL( refreshItems( const KFileItemList & ) ), + this, TQ_SLOT( slotRefreshItems( const KFileItemList & ) ) ); reloadList(); } @@ -154,7 +154,7 @@ void MediaApplet::arrangeButtons() MediumButton *button = *it; button_size = std::max(button_size, - orientation() == Qt::Vertical ? + orientation() == TQt::Vertical ? button->heightForWidth(width()) : button->widthForHeight(height()) ); // button->widthForHeight(height()) : @@ -162,7 +162,7 @@ void MediaApplet::arrangeButtons() } int kicker_size; - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { kicker_size = width(); } @@ -200,7 +200,7 @@ void MediaApplet::arrangeButtons() ++pack_count; - if(orientation() == Qt::Vertical) + if(orientation() == TQt::Vertical) { if (pack_count < max_packed_buttons) { @@ -425,7 +425,7 @@ void MediaApplet::reloadList() void MediaApplet::mousePressEvent(TQMouseEvent *e) { - if(e->button()==Qt::RightButton) + if(e->button()==TQt::RightButton) { TDEPopupMenu menu(this); diff --git a/kicker/applets/media/mediaapplet.h b/kicker/applets/media/mediaapplet.h index 4c57b508d..1703d98f0 100644 --- a/kicker/applets/media/mediaapplet.h +++ b/kicker/applets/media/mediaapplet.h @@ -38,7 +38,7 @@ typedef TQValueList<MediumButton*> MediumButtonList; class MediaApplet : public KPanelApplet { -Q_OBJECT +TQ_OBJECT public: MediaApplet(const TQString& configFile, Type t = Normal, int actions = 0, diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp index ce61cfbd6..be75a3d40 100644 --- a/kicker/applets/media/mediumbutton.cpp +++ b/kicker/applets/media/mediumbutton.cpp @@ -45,13 +45,13 @@ #include <konq_drag.h> MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem) - : PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)), mFileItem(fileItem), mOpenTimer(0, + : PanelPopupButton(parent), mActions(this, this), mFileItem(fileItem), mOpenTimer(0, "MediumButton::mOpenTimer") { - TDEAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), + TDEAction *a = KStdAction::paste(this, TQ_SLOT(slotPaste()), &mActions, "pasteto"); a->setShortcut(0); - a = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), &mActions, "copy"); + a = KStdAction::copy(this, TQ_SLOT(slotCopy()), &mActions, "copy"); a->setShortcut(0); setBackgroundOrigin(AncestorOrigin); @@ -64,11 +64,11 @@ MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem) refreshType(); - connect(&mOpenTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotDragOpen())); + connect(&mOpenTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotDragOpen())); // Activate this code only if we find a way to have both an // action and a popup menu for the same kicker button - //connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked())); + //connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked())); setPopup(new TQPopupMenu()); } @@ -122,8 +122,7 @@ void MediumButton::initPopup() void MediumButton::refreshType() { - KMimeType::Ptr mime = mFileItem.determineMimeType(); - TQToolTip::add(this, mime->comment()); + TQToolTip::add(this, mFileItem.text()); setIcon(mFileItem.iconName()); } diff --git a/kicker/applets/media/mediumbutton.h b/kicker/applets/media/mediumbutton.h index 76e448b27..40ee85ebd 100644 --- a/kicker/applets/media/mediumbutton.h +++ b/kicker/applets/media/mediumbutton.h @@ -32,7 +32,7 @@ class MediumButton : public PanelPopupButton { -Q_OBJECT +TQ_OBJECT public: MediumButton(TQWidget *parent, const KFileItem &fileItem); diff --git a/kicker/applets/media/preferencesdialog.h b/kicker/applets/media/preferencesdialog.h index b29f697ae..2354a73a2 100644 --- a/kicker/applets/media/preferencesdialog.h +++ b/kicker/applets/media/preferencesdialog.h @@ -30,7 +30,7 @@ class PreferencesDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: PreferencesDialog(KFileItemList media, TQWidget *parent=0, const char *name=0); ~PreferencesDialog(); diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp index f95e4e4c5..dff03a036 100644 --- a/kicker/applets/menu/menuapplet.cpp +++ b/kicker/applets/menu/menuapplet.cpp @@ -89,8 +89,8 @@ Applet::Applet( const TQString& configFile_P, TQWidget* parent_P ) setBackgroundOrigin(AncestorOrigin); dcopclient.registerAs( "menuapplet", false ); // toolbarAppearanceChanged(int) is sent when changing macstyle - connect( kapp, TQT_SIGNAL( toolbarAppearanceChanged( int )), - this, TQT_SLOT( readSettings())); + connect( kapp, TQ_SIGNAL( toolbarAppearanceChanged( int )), + this, TQ_SLOT( readSettings())); claimSelection(); readSettings(); updateTopEdgeOffset(); @@ -298,11 +298,11 @@ void Applet::claimSelection() { delete selection_watcher; selection_watcher = NULL; - connect( selection, TQT_SIGNAL( lostOwnership()), TQT_SLOT( lostSelection())); + connect( selection, TQ_SIGNAL( lostOwnership()), TQ_SLOT( lostSelection())); module = new KWinModule; - connect( module, TQT_SIGNAL( windowAdded( WId )), this, TQT_SLOT( windowAdded( WId ))); - connect( module, TQT_SIGNAL( activeWindowChanged( WId )), - this, TQT_SLOT( activeWindowChanged( WId ))); + connect( module, TQ_SIGNAL( windowAdded( WId )), this, TQ_SLOT( windowAdded( WId ))); + connect( module, TQ_SIGNAL( activeWindowChanged( WId )), + this, TQ_SLOT( activeWindowChanged( WId ))); TQValueList< WId > windows = module->windows(); for( TQValueList< WId >::ConstIterator it = windows.begin(); it != windows.end(); @@ -328,7 +328,7 @@ void Applet::lostSelection() if( selection_watcher == NULL ) { selection_watcher = new TDESelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay())); - connect( selection_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( claimSelection())); + connect( selection_watcher, TQ_SIGNAL( lostOwner()), this, TQ_SLOT( claimSelection())); } delete module; module = NULL; @@ -476,7 +476,7 @@ void MenuEmbed::setMinimumSize( int w, int h ) assert( msg_type_atom != None ); ev.xclient.message_type = msg_type_atom; ev.xclient.format = 32; - ev.xclient.data.l[0] = GET_QT_X_TIME(); + ev.xclient.data.l[0] = get_tqt_x_time(); ev.xclient.data.l[1] = minimumWidth(); ev.xclient.data.l[2] = minimumHeight(); ev.xclient.data.l[3] = 0; diff --git a/kicker/applets/menu/menuapplet.h b/kicker/applets/menu/menuapplet.h index 0b09334b6..159c7a37d 100644 --- a/kicker/applets/menu/menuapplet.h +++ b/kicker/applets/menu/menuapplet.h @@ -66,7 +66,7 @@ class MenuEmbed; class Applet : public KPanelApplet, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP k_dcop: @@ -186,7 +186,7 @@ private: class MenuEmbed : public QXEmbed { - Q_OBJECT + TQ_OBJECT public: diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp index ac0fa1340..437bae679 100644 --- a/kicker/applets/minipager/pagerapplet.cpp +++ b/kicker/applets/minipager/pagerapplet.cpp @@ -114,7 +114,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions, setFont( TDEGlobalSettings::taskbarFont() ); - m_twin = new KWinModule(TQT_TQOBJECT(this)); + m_twin = new KWinModule(this); m_activeWindow = m_twin->activeWindow(); m_curDesk = m_twin->currentDesktop(); @@ -123,7 +123,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions, m_curDesk = 1; } - desktopLayoutOrientation = Qt::Horizontal; + desktopLayoutOrientation = TQt::Horizontal; desktopLayoutX = -1; desktopLayoutY = -1; @@ -132,22 +132,22 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions, drawButtons(); - connect( m_twin, TQT_SIGNAL( currentDesktopChanged(int)), TQT_SLOT( slotSetDesktop(int) ) ); - connect( m_twin, TQT_SIGNAL( currentDesktopViewportChanged(int, const TQPoint&)), TQT_SLOT(slotSetDesktopViewport(int, const TQPoint&))); - connect( m_twin, TQT_SIGNAL( numberOfDesktopsChanged(int)), TQT_SLOT( slotSetDesktopCount(int) ) ); - connect( m_twin, TQT_SIGNAL( desktopGeometryChanged(int)), TQT_SLOT( slotRefreshViewportCount(int) ) ); - connect( m_twin, TQT_SIGNAL( activeWindowChanged(WId)), TQT_SLOT( slotActiveWindowChanged(WId) ) ); - connect( m_twin, TQT_SIGNAL( windowAdded(WId) ), this, TQT_SLOT( slotWindowAdded(WId) ) ); - connect( m_twin, TQT_SIGNAL( windowRemoved(WId) ), this, TQT_SLOT( slotWindowRemoved(WId) ) ); - connect( m_twin, TQT_SIGNAL( windowChanged(WId,unsigned int) ), this, TQT_SLOT( slotWindowChanged(WId,unsigned int) ) ); - connect( m_twin, TQT_SIGNAL( desktopNamesChanged() ), this, TQT_SLOT( slotDesktopNamesChanged() ) ); - connect( kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int)) ); + connect( m_twin, TQ_SIGNAL( currentDesktopChanged(int)), TQ_SLOT( slotSetDesktop(int) ) ); + connect( m_twin, TQ_SIGNAL( currentDesktopViewportChanged(int, const TQPoint&)), TQ_SLOT(slotSetDesktopViewport(int, const TQPoint&))); + connect( m_twin, TQ_SIGNAL( numberOfDesktopsChanged(int)), TQ_SLOT( slotSetDesktopCount(int) ) ); + connect( m_twin, TQ_SIGNAL( desktopGeometryChanged(int)), TQ_SLOT( slotRefreshViewportCount(int) ) ); + connect( m_twin, TQ_SIGNAL( activeWindowChanged(WId)), TQ_SLOT( slotActiveWindowChanged(WId) ) ); + connect( m_twin, TQ_SIGNAL( windowAdded(WId) ), this, TQ_SLOT( slotWindowAdded(WId) ) ); + connect( m_twin, TQ_SIGNAL( windowRemoved(WId) ), this, TQ_SLOT( slotWindowRemoved(WId) ) ); + connect( m_twin, TQ_SIGNAL( windowChanged(WId,unsigned int) ), this, TQ_SLOT( slotWindowChanged(WId,unsigned int) ) ); + connect( m_twin, TQ_SIGNAL( desktopNamesChanged() ), this, TQ_SLOT( slotDesktopNamesChanged() ) ); + connect( kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)) ); if (kapp->authorizeTDEAction("kicker_rmb") && kapp->authorizeControlModule("tde-kcmtaskbar.desktop")) { m_contextMenu = new TQPopupMenu(); - connect(m_contextMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShowContextMenu())); - connect(m_contextMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); + connect(m_contextMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShowContextMenu())); + connect(m_contextMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int))); setCustomMenu(m_contextMenu); } @@ -246,7 +246,7 @@ void KMiniPager::slotButtonSelected( int desk ) int KMiniPager::widthForHeight(int h) const { - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { return width(); } @@ -302,7 +302,7 @@ int KMiniPager::widthForHeight(int h) const int KMiniPager::heightForWidth(int w) const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return height(); } @@ -366,7 +366,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y) { // must own manager selection before setting global desktop layout int screen = DefaultScreen( tqt_xdisplay()); m_desktopLayoutOwner = new TDESelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(), - screen, TQT_TQOBJECT(this) ); + screen, this ); if( !m_desktopLayoutOwner->claim( false )) { delete m_desktopLayoutOwner; @@ -374,14 +374,14 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y) return; } } - NET::Orientation orient = o == Qt::Horizontal ? NET::OrientationHorizontal : NET::OrientationVertical; + NET::Orientation orient = o == TQt::Horizontal ? NET::OrientationHorizontal : NET::OrientationVertical; NETRootInfo i( tqt_xdisplay(), 0 ); i.setDesktopLayout( orient, x, y, NET::DesktopLayoutCornerTopLeft ); } void KMiniPager::resizeEvent(TQResizeEvent*) { - bool horiz = orientation() == Qt::Horizontal; + bool horiz = orientation() == TQt::Horizontal; int deskNum = m_desktops.count(); int rowNum = m_settings->numberOfRows(); @@ -408,13 +408,13 @@ void KMiniPager::resizeEvent(TQResizeEvent*) { nDX = rowNum; nDY = deskCols; - updateDesktopLayout(Qt::Horizontal, -1, nDX); + updateDesktopLayout(TQt::Horizontal, -1, nDX); } else { nDX = deskCols; nDY = rowNum; - updateDesktopLayout(Qt::Horizontal, nDY, -1); + updateDesktopLayout(TQt::Horizontal, nDY, -1); } // 1 pixel spacing. @@ -484,10 +484,10 @@ void KMiniPager::drawButtons() m_desktops.append( desk ); m_group->insert( desk, count ); - connect(desk, TQT_SIGNAL(buttonSelected(int)), - TQT_SLOT(slotButtonSelected(int)) ); - connect(desk, TQT_SIGNAL(showMenu(const TQPoint&, int )), - TQT_SLOT(slotShowMenu(const TQPoint&, int )) ); + connect(desk, TQ_SIGNAL(buttonSelected(int)), + TQ_SLOT(slotButtonSelected(int)) ); + connect(desk, TQ_SIGNAL(showMenu(const TQPoint&, int )), + TQ_SLOT(slotShowMenu(const TQPoint&, int )) ); desk->show(); ++count; @@ -727,8 +727,8 @@ void KMiniPager::aboutToShowContextMenu() rowMenu->insertItem(i18n("one row or column", "&1"), 1 + rowOffset); rowMenu->insertItem(i18n("two rows or columns", "&2"), 2 + rowOffset); rowMenu->insertItem( i18n("three rows or columns", "&3"), 3 + rowOffset); - connect(rowMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); - showMenu->insertItem((orientation()==Qt::Horizontal) ? i18n("&Rows"): + connect(rowMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int))); + showMenu->insertItem((orientation()==TQt::Horizontal) ? i18n("&Rows"): i18n("&Columns"), rowMenu); @@ -753,7 +753,7 @@ void KMiniPager::aboutToShowContextMenu() showMenu->insertItem(i18n("&Desktop Wallpaper"), PagerSettings::EnumBackgroundType::BgLive + bgOffset); } - connect(showMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); + connect(showMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int))); m_contextMenu->insertItem(i18n("&Pager Options"),showMenu); m_contextMenu->insertItem(SmallIcon("configure"), @@ -892,7 +892,7 @@ void KMiniPager::showPager() else { // Let's run kpager if it isn't running - connect( dcop, TQT_SIGNAL( applicationRegistered(const TQCString &) ), this, TQT_SLOT(applicationRegistered(const TQCString &)) ); + connect( dcop, TQ_SIGNAL( applicationRegistered(const TQCString &) ), this, TQ_SLOT(applicationRegistered(const TQCString &)) ); dcop->setNotifications(true); TQString strAppPath(locate("exe", "kpager")); if (!strAppPath.isEmpty()) @@ -941,8 +941,8 @@ void KMiniPager::applicationRegistered( const TQCString & appName ) { if (appName == "kpager") { - disconnect( kapp->dcopClient(), TQT_SIGNAL( applicationRegistered(const TQCString &) ), - this, TQT_SLOT(applicationRegistered(const TQCString &)) ); + disconnect( kapp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString &) ), + this, TQ_SLOT(applicationRegistered(const TQCString &)) ); showKPager(false); } } diff --git a/kicker/applets/minipager/pagerapplet.h b/kicker/applets/minipager/pagerapplet.h index 1f0edc409..ceb5ec8f4 100644 --- a/kicker/applets/minipager/pagerapplet.h +++ b/kicker/applets/minipager/pagerapplet.h @@ -46,7 +46,7 @@ class PagerSettings; class KMiniPager : public KPanelApplet { - Q_OBJECT + TQ_OBJECT public: KMiniPager(const TQString& configFile, Type t = Normal, int actions = 0, diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp index 3e51a199e..22f59956d 100644 --- a/kicker/applets/minipager/pagerbutton.cpp +++ b/kicker/applets/minipager/pagerbutton.cpp @@ -83,10 +83,10 @@ KMiniPagerButton::KMiniPagerButton(int desk, bool useViewPorts, const TQPoint& v m_desktopName = m_pager->twin()->desktopName(m_desktop); - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked())); - connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool))); - connect(&m_dragSwitchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDragSwitch())); - connect(&m_updateCompressor, TQT_SIGNAL(timeout()), this, TQT_SLOT(update())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotClicked())); + connect(this, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggled(bool))); + connect(&m_dragSwitchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDragSwitch())); + connect(&m_updateCompressor, TQ_SIGNAL(timeout()), this, TQ_SLOT(update())); if (m_pager->desktopPreview()) { @@ -247,8 +247,8 @@ void KMiniPagerButton::loadBgPixmap() } else if (s_commonSharedPixmap) { // other button is already fetching the pixmap - connect(s_commonSharedPixmap, TQT_SIGNAL(done(bool)), - TQT_SLOT(backgroundLoaded(bool))); + connect(s_commonSharedPixmap, TQ_SIGNAL(done(bool)), + TQ_SLOT(backgroundLoaded(bool))); return; } } @@ -258,8 +258,8 @@ void KMiniPagerButton::loadBgPixmap() if (!s_commonSharedPixmap) { s_commonSharedPixmap = new TDESharedPixmap; - connect(s_commonSharedPixmap, TQT_SIGNAL(done(bool)), - TQT_SLOT(backgroundLoaded(bool))); + connect(s_commonSharedPixmap, TQ_SIGNAL(done(bool)), + TQ_SLOT(backgroundLoaded(bool))); } retval = s_commonSharedPixmap->loadFromShared(TQString("DESKTOP1")); if (retval == false) { @@ -274,8 +274,8 @@ void KMiniPagerButton::loadBgPixmap() if (!m_sharedPixmap) { m_sharedPixmap = new TDESharedPixmap; - connect(m_sharedPixmap, TQT_SIGNAL(done(bool)), - TQT_SLOT(backgroundLoaded(bool))); + connect(m_sharedPixmap, TQ_SIGNAL(done(bool)), + TQ_SLOT(backgroundLoaded(bool))); } retval = m_sharedPixmap->loadFromShared(TQString("DESKTOP%1").arg(m_desktop)); if (retval == false) { @@ -528,10 +528,10 @@ void KMiniPagerButton::drawButton(TQPainter *bp) void KMiniPagerButton::mousePressEvent(TQMouseEvent * e) { - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) { // prevent LMB down -> RMB down -> LMB up sequence - if ((e->state() & Qt::MouseButtonMask ) == Qt::NoButton) + if ((e->state() & TQt::MouseButtonMask ) == TQt::NoButton) { emit showMenu(e->globalPos(), m_desktop); return; @@ -726,7 +726,7 @@ void KMiniPagerButton::rename() { if ( !m_lineEdit ) { m_lineEdit = new TQLineEdit( this ); - connect( m_lineEdit, TQT_SIGNAL( returnPressed() ), m_lineEdit, TQT_SLOT( hide() ) ); + connect( m_lineEdit, TQ_SIGNAL( returnPressed() ), m_lineEdit, TQ_SLOT( hide() ) ); m_lineEdit->installEventFilter( this ); } m_lineEdit->setGeometry( rect() ); @@ -747,12 +747,12 @@ void KMiniPagerButton::slotToggled( bool b ) bool KMiniPagerButton::eventFilter( TQObject *o, TQEvent * e) { - if (o && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_lineEdit) && + if (o && o == m_lineEdit && (e->type() == TQEvent::FocusOut || e->type() == TQEvent::Hide)) { m_pager->twin()->setDesktopName( m_desktop, m_lineEdit->text() ); m_desktopName = m_lineEdit->text(); - TQTimer::singleShot( 0, m_lineEdit, TQT_SLOT( deleteLater() ) ); + TQTimer::singleShot( 0, m_lineEdit, TQ_SLOT( deleteLater() ) ); m_lineEdit = 0; return true; } @@ -829,7 +829,7 @@ void KMiniPagerButton::updateKickerTip(KickerTip::Data &data) } data.duration = 4000; - data.icon = DesktopIcon("window_list", TDEIcon::SizeMedium); + data.icon = DesktopIcon("window_duplicate", TDEIcon::SizeMedium); data.message = TQStyleSheet::escape(m_desktopName); data.direction = m_pager->popupDirection(); } diff --git a/kicker/applets/minipager/pagerbutton.h b/kicker/applets/minipager/pagerbutton.h index 042820f20..4d889c39e 100644 --- a/kicker/applets/minipager/pagerbutton.h +++ b/kicker/applets/minipager/pagerbutton.h @@ -37,7 +37,7 @@ class TQLineEdit; class KMiniPagerButton : public TQButton, public KickerTip::Client { - Q_OBJECT + TQ_OBJECT public: KMiniPagerButton(int desk, bool useViewports, const TQPoint& viewport, KMiniPager *parent=0, const char *name=0); diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp index 1da45a350..83db26d12 100644 --- a/kicker/applets/naughty/NaughtyApplet.cpp +++ b/kicker/applets/naughty/NaughtyApplet.cpp @@ -67,29 +67,28 @@ NaughtyApplet::NaughtyApplet setBackgroundOrigin( AncestorOrigin ); button_ = new SimpleButton(this); - button_->setFixedSize(20, 20); TQVBoxLayout * layout = new TQVBoxLayout(this); layout->addWidget(button_); - monitor_ = new NaughtyProcessMonitor(2, 20, TQT_TQOBJECT(this)); + monitor_ = new NaughtyProcessMonitor(2, 20, this); connect ( - button_, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotPreferences()) + button_, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotPreferences()) ); connect ( - monitor_, TQT_SIGNAL(runawayProcess(ulong, const TQString &)), - this, TQT_SLOT(slotWarn(ulong, const TQString &)) + monitor_, TQ_SIGNAL(runawayProcess(ulong, const TQString &)), + this, TQ_SLOT(slotWarn(ulong, const TQString &)) ); connect ( - monitor_, TQT_SIGNAL(load(uint)), - this, TQT_SLOT(slotLoad(uint)) + monitor_, TQ_SIGNAL(load(uint)), + this, TQ_SLOT(slotLoad(uint)) ); loadSettings(); @@ -132,25 +131,15 @@ NaughtyApplet::slotWarn(ulong pid, const TQString & name) } } - int -NaughtyApplet::widthForHeight(int) const -{ - return 20; -} - - int -NaughtyApplet::heightForWidth(int) const -{ - return 20; -} void NaughtyApplet::slotLoad(uint l) { - if (l > monitor_->triggerLevel()) - button_->setPixmap(BarIcon("naughty-sad")); - else - button_->setPixmap(BarIcon("naughty-happy")); + button_->setPixmap(TDEGlobal::iconLoader()->loadIcon( + (l > monitor_->triggerLevel() ? "naughty-sad" : "naughty-happy"), + TDEIcon::Panel, + TQMIN(size().width(),size().height())-2 + )); } void diff --git a/kicker/applets/naughty/NaughtyApplet.h b/kicker/applets/naughty/NaughtyApplet.h index eb9850851..0ef796ea4 100644 --- a/kicker/applets/naughty/NaughtyApplet.h +++ b/kicker/applets/naughty/NaughtyApplet.h @@ -31,7 +31,7 @@ class TQPushButton; class NaughtyApplet : public KPanelApplet { - Q_OBJECT + TQ_OBJECT public: @@ -46,8 +46,6 @@ class NaughtyApplet : public KPanelApplet ~NaughtyApplet(); - virtual int widthForHeight(int h) const; - virtual int heightForWidth(int w) const; signals: diff --git a/kicker/applets/naughty/NaughtyConfigDialog.h b/kicker/applets/naughty/NaughtyConfigDialog.h index 4e428f00f..41be8344e 100644 --- a/kicker/applets/naughty/NaughtyConfigDialog.h +++ b/kicker/applets/naughty/NaughtyConfigDialog.h @@ -28,7 +28,7 @@ class KIntNumInput; class NaughtyConfigDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.cpp b/kicker/applets/naughty/NaughtyProcessMonitor.cpp index 09c02cbf9..63b634e59 100644 --- a/kicker/applets/naughty/NaughtyProcessMonitor.cpp +++ b/kicker/applets/naughty/NaughtyProcessMonitor.cpp @@ -39,6 +39,10 @@ #include <signal.h> #include <unistd.h> +#ifdef Q_OS_SOLARIS +#include <procfs.h> +#endif + #include <tqfile.h> #include <tqstring.h> #include <tqstringlist.h> @@ -107,7 +111,7 @@ NaughtyProcessMonitor::NaughtyProcessMonitor #ifdef __NetBSD__ d->kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, "kvm_open"); #endif - connect(d->timer_, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); + connect(d->timer_, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); } NaughtyProcessMonitor::~NaughtyProcessMonitor() @@ -210,7 +214,7 @@ NaughtyProcessMonitor::_process(ulong pid, uint load) bool NaughtyProcessMonitor::canKill(ulong pid) const { -#ifdef __linux__ +#ifdef Q_OS_LINUX TQFile f("/proc/" + TQString::number(pid) + "/status"); if (!f.open(IO_ReadOnly)) @@ -240,6 +244,17 @@ NaughtyProcessMonitor::canKill(ulong pid) const return false ; return geteuid () == d->uidMap_[pid] ; +#elif defined(Q_OS_SOLARIS) + TQFile f("/proc/" + TQString::number(pid) + "/psinfo"); + TQByteArray raw; + psinfo_t *inf; + + if (!f.open(IO_ReadOnly)) + return false; + raw = f.readAll(); + f.close(); + inf = (psinfo_t *)raw.data(); + return geteuid() == inf->pr_euid; #else Q_UNUSED( pid ); return false; @@ -249,8 +264,9 @@ NaughtyProcessMonitor::canKill(ulong pid) const TQString NaughtyProcessMonitor::processName(ulong pid) const { -#if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) -#ifdef __linux__ +#if defined(Q_OS_LINUX) || defined(__OpenBSD__) || defined(__NetBSD__) || \ + defined(Q_OS_SOLARIS) +#if defined(Q_OS_LINUX) || defined(Q_OS_SOLARIS) TQFile f("/proc/" + TQString::number(pid) + "/cmdline"); if (!f.open(IO_ReadOnly)) @@ -344,7 +360,7 @@ NaughtyProcessMonitor::processName(ulong pid) const uint NaughtyProcessMonitor::cpuLoad() const { -#ifdef __linux__ +#ifdef Q_OS_LINUX TQFile f("/proc/stat"); if (!f.open(IO_ReadOnly)) @@ -400,7 +416,7 @@ NaughtyProcessMonitor::cpuLoad() const TQValueList<ulong> NaughtyProcessMonitor::pidList() const { -#ifdef __linux__ +#if defined(Q_OS_LINUX) || defined(Q_OS_SOLARIS) TQStringList dl(TQDir("/proc").entryList()); TQValueList<ulong> pl; @@ -505,7 +521,7 @@ NaughtyProcessMonitor::pidList() const bool NaughtyProcessMonitor::getLoad(ulong pid, uint & load) const { -#ifdef __linux__ +#ifdef Q_OS_LINUX TQFile f("/proc/" + TQString::number(pid) + "/stat"); if (!f.open(IO_ReadOnly)) @@ -540,7 +556,8 @@ NaughtyProcessMonitor::getLoad(ulong pid, uint & load) const bool NaughtyProcessMonitor::kill(ulong pid) const { -#if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) +#if defined(Q_OS_LINUX) || defined(__OpenBSD__) || defined(__NetBSD__) ||\ + defined(Q_OS_SOLARIS) return 0 == ::kill(pid, SIGKILL); #else Q_UNUSED( pid ); diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.h b/kicker/applets/naughty/NaughtyProcessMonitor.h index d66479964..3075bb9bd 100644 --- a/kicker/applets/naughty/NaughtyProcessMonitor.h +++ b/kicker/applets/naughty/NaughtyProcessMonitor.h @@ -27,7 +27,7 @@ class NaughtyProcessMonitorPrivate; class NaughtyProcessMonitor : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kicker/applets/naughty/naughty-happy.png b/kicker/applets/naughty/naughty-happy.png Binary files differindex 4c3505dfc..cbd451365 100644 --- a/kicker/applets/naughty/naughty-happy.png +++ b/kicker/applets/naughty/naughty-happy.png diff --git a/kicker/applets/naughty/naughty-sad.png b/kicker/applets/naughty/naughty-sad.png Binary files differindex ae6d727f2..82a8279f5 100644 --- a/kicker/applets/naughty/naughty-sad.png +++ b/kicker/applets/naughty/naughty-sad.png diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp index aaadfc33d..638ce93c8 100644 --- a/kicker/applets/run/runapplet.cpp +++ b/kicker/applets/run/runapplet.cpp @@ -69,15 +69,15 @@ RunApplet::RunApplet(const TQString& configFile, Type type, int actions, f = _btn->font(); f.setPixelSize(12); _btn->setFont(f); - connect(_btn, TQT_SIGNAL(clicked()), TQT_SLOT(popup_combo())); + connect(_btn, TQ_SIGNAL(clicked()), TQ_SLOT(popup_combo())); // setup history combo _input = new KHistoryCombo(this); _input->setFocus(); _input->clearEdit(); watchForFocus(_input->lineEdit()); - connect(_input, TQT_SIGNAL(activated(const TQString&)), - TQT_SLOT(run_command(const TQString&))); + connect(_input, TQ_SIGNAL(activated(const TQString&)), + TQ_SLOT(run_command(const TQString&))); TDEConfig *c = config(); c->setGroup("General"); @@ -115,7 +115,7 @@ RunApplet::~RunApplet() void RunApplet::resizeEvent(TQResizeEvent*) { - if(orientation() == Qt::Horizontal) + if(orientation() == TQt::Horizontal) { _btn->hide(); _input->reparent(this, TQPoint(0,0), true); @@ -288,7 +288,7 @@ void RunApplet::run_command(const TQString& command) return; hide: - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) _hbox->hide(); needsFocus(focusNeeded); } diff --git a/kicker/applets/run/runapplet.h b/kicker/applets/run/runapplet.h index d5d12435f..adb0d4c6f 100644 --- a/kicker/applets/run/runapplet.h +++ b/kicker/applets/run/runapplet.h @@ -35,7 +35,7 @@ class KURIFilterData; class RunApplet : public KPanelApplet { - Q_OBJECT + TQ_OBJECT public: RunApplet(const TQString& configFile, Type t = Stretch, int actions = 0, diff --git a/kicker/applets/swallow/prefwidget.h b/kicker/applets/swallow/prefwidget.h index a23d6414b..03cde1399 100644 --- a/kicker/applets/swallow/prefwidget.h +++ b/kicker/applets/swallow/prefwidget.h @@ -23,7 +23,7 @@ class PreferencesWidget : public PreferencesWidgetBase { - Q_OBJECT + TQ_OBJECT public: PreferencesWidget( SwallowCommandList* swc, TQWidget* parent = 0 ); diff --git a/kicker/applets/swallow/prefwidgetbase.ui b/kicker/applets/swallow/prefwidgetbase.ui index bd2673efa..13f8aa300 100644 --- a/kicker/applets/swallow/prefwidgetbase.ui +++ b/kicker/applets/swallow/prefwidgetbase.ui @@ -119,16 +119,13 @@ </spacer> </grid> </widget> -<includes> - <include location="local" impldecl="in implementation">kdialog.h</include> -</includes> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>keditlistbox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">keditlistbox.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="local" impldecl="in implementation">kdialog.h</include> +</includes> </UI> diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp index 1ac34cfec..c30a31cff 100644 --- a/kicker/applets/swallow/swallow.cpp +++ b/kicker/applets/swallow/swallow.cpp @@ -157,8 +157,8 @@ void SwallowApplet::createApps( SwallowCommandList* list ) while ( (it.current()) ) { app = new SwallowApp( it.current(), this ); app->hide(); - connect( app, TQT_SIGNAL( embedded(SwallowApp *)), - TQT_SLOT( embedded(SwallowApp *))); + connect( app, TQ_SIGNAL( embedded(SwallowApp *)), + TQ_SLOT( embedded(SwallowApp *))); appList->append( app ); ++it; kapp->processEvents(); @@ -179,8 +179,8 @@ void SwallowApplet::embedded( SwallowApp *app ) kdDebug() << "--> ratio: " << app->sizeRatio() << endl; kdDebug() << "**** " << app << " is embedded now, with (" << app->width() << ", " << app->height() << ")" << endl; - disconnect( app, TQT_SIGNAL( embedded(SwallowApp *)), - this, TQT_SLOT( embedded(SwallowApp *))); + disconnect( app, TQ_SIGNAL( embedded(SwallowApp *)), + this, TQ_SLOT( embedded(SwallowApp *))); embeddedList->append( app ); @@ -278,8 +278,8 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent, QXEmbed::initialize(); winTitle = swc->title; - connect(SwallowApplet::winModule(), TQT_SIGNAL(windowAdded(WId)), - this, TQT_SLOT(windowAdded(WId))); + connect(SwallowApplet::winModule(), TQ_SIGNAL(windowAdded(WId)), + this, TQ_SLOT(windowAdded(WId))); if (!swc->cmdline.isEmpty()) { TDEProcess *process = new TDEProcess; @@ -289,8 +289,8 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent, // *process << "-geometry"; // *process << TQString("32x32+%1+%2").arg(kapp->desktop()->width()).arg(kapp->desktop()->height()); - connect(process, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(processExited(TDEProcess*))); + connect(process, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(processExited(TDEProcess*))); process->start(); } @@ -330,8 +330,8 @@ void SwallowApp::windowAdded(WId win) embed(win); XReparentWindow(tqt_xdisplay(), win, winId(), 0, 0); - disconnect(SwallowApplet::winModule(), TQT_SIGNAL(windowAdded(WId)), - this, TQT_SLOT(windowAdded(WId))); + disconnect(SwallowApplet::winModule(), TQ_SIGNAL(windowAdded(WId)), + this, TQ_SLOT(windowAdded(WId))); emit embedded( this ); } diff --git a/kicker/applets/swallow/swallow.h b/kicker/applets/swallow/swallow.h index b4be4f624..8bacc79f3 100644 --- a/kicker/applets/swallow/swallow.h +++ b/kicker/applets/swallow/swallow.h @@ -44,7 +44,7 @@ typedef TQPtrList<SwallowApp> SwallowAppList; class SwallowApplet : public KPanelApplet { - Q_OBJECT + TQ_OBJECT public: SwallowApplet( const TQString& configFile, TQWidget *parent, @@ -88,7 +88,7 @@ private: class SwallowApp : public QXEmbed { - Q_OBJECT + TQ_OBJECT public: SwallowApp( const SwallowCommand * swc, TQWidget* parent = 0, diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 97b71d1b2..664dd85ad 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -99,19 +99,19 @@ SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int ac m_clockApplet = new ClockApplet(configFile, KPanelApplet::Normal, KPanelApplet::Preferences, this, "clockapplet"); updateClockGeometry(); - connect(m_clockApplet, TQT_SIGNAL(clockReconfigured()), this, TQT_SLOT(updateClockGeometry())); - connect(m_clockApplet, TQT_SIGNAL(updateLayout()), this, TQT_SLOT(updateClockGeometry())); + connect(m_clockApplet, TQ_SIGNAL(clockReconfigured()), this, TQ_SLOT(updateClockGeometry())); + connect(m_clockApplet, TQ_SIGNAL(updateLayout()), this, TQ_SLOT(updateClockGeometry())); setBackgroundOrigin(AncestorOrigin); - twin_module = new KWinModule(TQT_TQOBJECT(this)); + twin_module = new KWinModule(this); // kApplication notifies us of settings changes. added to support // disabling of frame effect on mouse hover kapp->dcopClient()->setNotifications(true); connectDCOPSignal("kicker", "kicker", "configurationChanged()", "loadSettings()", false); - TQTimer::singleShot(0, this, TQT_SLOT(initialize())); + TQTimer::singleShot(0, this, TQ_SLOT(initialize())); } void SystemTrayApplet::updateClockGeometry() @@ -119,7 +119,7 @@ void SystemTrayApplet::updateClockGeometry() if (m_clockApplet) { m_clockApplet->setPosition(position()); - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { m_clockApplet->setFixedSize(m_clockApplet->widthForHeight(height()),height()); } @@ -151,10 +151,10 @@ void SystemTrayApplet::initialize() } // the KWinModule notifies us when tray windows are added or removed - connect( twin_module, TQT_SIGNAL( systemTrayWindowAdded(WId) ), - this, TQT_SLOT( systemTrayWindowAdded(WId) ) ); - connect( twin_module, TQT_SIGNAL( systemTrayWindowRemoved(WId) ), - this, TQT_SLOT( updateTrayWindows() ) ); + connect( twin_module, TQ_SIGNAL( systemTrayWindowAdded(WId) ), + this, TQ_SLOT( systemTrayWindowAdded(WId) ) ); + connect( twin_module, TQ_SIGNAL( systemTrayWindowRemoved(WId) ), + this, TQ_SLOT( updateTrayWindows() ) ); TQCString screenstr; screenstr.setNum(tqt_xscreen()); @@ -249,11 +249,11 @@ void SystemTrayApplet::preferences() KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel, KDialogBase::Ok, true); m_settingsDialog->resize(450, 400); - connect(m_settingsDialog, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(applySettings())); - connect(m_settingsDialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(applySettings())); - connect(m_settingsDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(settingsDialogFinished())); + connect(m_settingsDialog, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(applySettings())); + connect(m_settingsDialog, TQ_SIGNAL(okClicked()), this, TQ_SLOT(applySettings())); + connect(m_settingsDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(settingsDialogFinished())); - TQGrid *settingsGrid = m_settingsDialog->makeGridMainWidget( 2, Qt::Vertical); + TQGrid *settingsGrid = m_settingsDialog->makeGridMainWidget( 2, TQt::Vertical); m_showClockSettingCB = new TQCheckBox(i18n("Show Clock in Tray"), settingsGrid); m_showClockSettingCB->setChecked(m_showClockInTray); @@ -432,11 +432,11 @@ void SystemTrayApplet::showExpandButton(bool show) { if (!m_expandButton) { - m_expandButton = new SimpleArrowButton(this, Qt::UpArrow, 0, KickerSettings::showDeepButtons()); + m_expandButton = new SimpleArrowButton(this, TQt::UpArrow, 0, KickerSettings::showDeepButtons()); m_expandButton->installEventFilter(this); refreshExpandButton(); - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { m_expandButton->setFixedSize(width() - 4, m_expandButton->sizeHint() @@ -448,12 +448,12 @@ void SystemTrayApplet::showExpandButton(bool show) .width(), height() - 4); } - connect(m_expandButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(toggleExpanded())); + connect(m_expandButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(toggleExpanded())); m_autoRetractTimer = new TQTimer(this, "m_autoRetractTimer"); - connect(m_autoRetractTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(checkAutoRetract())); + connect(m_autoRetractTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(checkAutoRetract())); } else { @@ -559,7 +559,7 @@ void SystemTrayApplet::embedWindow( WId w, bool kde_tray ) return; } - connect(emb, TQT_SIGNAL(embeddedWindowDestroyed()), TQT_SLOT(updateTrayWindows())); + connect(emb, TQ_SIGNAL(embeddedWindowDestroyed()), TQ_SLOT(updateTrayWindows())); emb->setFixedSize(m_iconSize, m_iconSize); if (shouldHide(w)) @@ -677,12 +677,12 @@ void SystemTrayApplet::refreshExpandButton() return; } - Qt::ArrowType a; + TQt::ArrowType a; - if (orientation() == Qt::Vertical) - a = m_showHidden ? Qt::DownArrow : Qt::UpArrow; + if (orientation() == TQt::Vertical) + a = m_showHidden ? TQt::DownArrow : TQt::UpArrow; else - a = (m_showHidden ^ kapp->reverseLayout()) ? Qt::RightArrow : Qt::LeftArrow; + a = (m_showHidden ^ kapp->reverseLayout()) ? TQt::RightArrow : TQt::LeftArrow; m_expandButton->setArrowType(a); } @@ -833,17 +833,17 @@ int SystemTrayApplet::maxIconHeight() const bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e) { - if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(m_expandButton)) + if (watched == m_expandButton) { TQPoint p; if (e->type() == TQEvent::ContextMenu) { - p = TQT_TQCONTEXTMENUEVENT(e)->globalPos(); + p = static_cast<TQContextMenuEvent*>(e)->globalPos(); } else if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if (me->button() == Qt::RightButton) + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); + if (me->button() == TQt::RightButton) { p = me->globalPos(); } @@ -853,9 +853,9 @@ bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e) { TQPopupMenu* contextMenu = new TQPopupMenu(this); contextMenu->insertItem(SmallIcon("configure"), i18n("Configure System Tray..."), - this, TQT_SLOT(configure())); + this, TQ_SLOT(configure())); - contextMenu->exec(TQT_TQCONTEXTMENUEVENT(e)->globalPos()); + contextMenu->exec(static_cast<TQContextMenuEvent*>(e)->globalPos()); delete contextMenu; return true; @@ -867,7 +867,7 @@ bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e) int SystemTrayApplet::widthForHeight(int h) const { - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { return width(); } @@ -886,7 +886,7 @@ int SystemTrayApplet::widthForHeight(int h) const int SystemTrayApplet::heightForWidth(int w) const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return height(); } @@ -913,7 +913,7 @@ void SystemTrayApplet::resizeEvent( TQResizeEvent* ) { layoutTray(); // we need to give ourselves a chance to adjust our size before calling this - TQTimer::singleShot(0, this, TQT_SIGNAL(updateLayout())); + TQTimer::singleShot(0, this, TQ_SIGNAL(updateLayout())); } void SystemTrayApplet::layoutTray() @@ -937,7 +937,7 @@ void SystemTrayApplet::layoutTray() if (m_expandButton) { - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { m_expandButton->setFixedSize(width() - 4, m_expandButton->sizeHint().height()); } @@ -961,7 +961,7 @@ void SystemTrayApplet::layoutTray() // This fix makes the workarounds in the heightForWidth() and widthForHeight() methods unneeded. // - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { int iconWidth = maxIconWidth() + ICON_MARGIN; // +2 for the margins that implied by the layout heightWidth = width() - ICON_MARGIN; @@ -972,7 +972,7 @@ void SystemTrayApplet::layoutTray() m_layout->addMultiCellWidget(m_leftSpacer, 0, 0, 0, nbrOfLines - 1, - Qt::AlignHCenter | Qt::AlignVCenter); + TQt::AlignHCenter | TQt::AlignVCenter); col = 1; if (showExpandButton) @@ -980,7 +980,7 @@ void SystemTrayApplet::layoutTray() m_layout->addMultiCellWidget(m_expandButton, 1, 1, 0, nbrOfLines - 1, - Qt::AlignHCenter | Qt::AlignVCenter); + TQt::AlignHCenter | TQt::AlignVCenter); col = 2; } @@ -993,7 +993,7 @@ void SystemTrayApplet::layoutTray() line = i % nbrOfLines; (*emb)->show(); m_layout->addWidget((*emb), col, line, - Qt::AlignHCenter | Qt::AlignVCenter); + TQt::AlignHCenter | TQt::AlignVCenter); if ((line + 1) == nbrOfLines) { @@ -1011,7 +1011,7 @@ void SystemTrayApplet::layoutTray() line = i % nbrOfLines; (*emb)->show(); m_layout->addWidget((*emb), col, line, - Qt::AlignHCenter | Qt::AlignVCenter); + TQt::AlignHCenter | TQt::AlignVCenter); if ((line + 1) == nbrOfLines) { @@ -1024,7 +1024,7 @@ void SystemTrayApplet::layoutTray() m_layout->addMultiCellWidget(m_rightSpacer, col, col, 0, nbrOfLines - 1, - Qt::AlignHCenter | Qt::AlignVCenter); + TQt::AlignHCenter | TQt::AlignVCenter); if (m_clockApplet) { if (m_showClockInTray) @@ -1035,7 +1035,7 @@ void SystemTrayApplet::layoutTray() m_layout->addMultiCellWidget(m_clockApplet, col+1, col+1, 0, nbrOfLines - 1, - Qt::AlignHCenter | Qt::AlignVCenter); + TQt::AlignHCenter | TQt::AlignVCenter); } } else // horizontal @@ -1048,7 +1048,7 @@ void SystemTrayApplet::layoutTray() m_layout->addMultiCellWidget(m_leftSpacer, 0, nbrOfLines - 1, 0, 0, - Qt::AlignHCenter | Qt::AlignVCenter); + TQt::AlignHCenter | TQt::AlignVCenter); col = 1; if (showExpandButton) @@ -1056,7 +1056,7 @@ void SystemTrayApplet::layoutTray() m_layout->addMultiCellWidget(m_expandButton, 0, nbrOfLines - 1, 1, 1, - Qt::AlignHCenter | Qt::AlignVCenter); + TQt::AlignHCenter | TQt::AlignVCenter); col = 2; } @@ -1068,7 +1068,7 @@ void SystemTrayApplet::layoutTray() line = i % nbrOfLines; (*emb)->show(); m_layout->addWidget((*emb), line, col, - Qt::AlignHCenter | Qt::AlignVCenter); + TQt::AlignHCenter | TQt::AlignVCenter); if ((line + 1) == nbrOfLines) { @@ -1086,7 +1086,7 @@ void SystemTrayApplet::layoutTray() line = i % nbrOfLines; (*emb)->show(); m_layout->addWidget((*emb), line, col, - Qt::AlignHCenter | Qt::AlignVCenter); + TQt::AlignHCenter | TQt::AlignVCenter); if ((line + 1) == nbrOfLines) { @@ -1099,7 +1099,7 @@ void SystemTrayApplet::layoutTray() m_layout->addMultiCellWidget(m_rightSpacer, 0, nbrOfLines - 1, col, col, - Qt::AlignHCenter | Qt::AlignVCenter); + TQt::AlignHCenter | TQt::AlignVCenter); if (m_clockApplet) { if (m_showClockInTray) @@ -1110,7 +1110,7 @@ void SystemTrayApplet::layoutTray() m_layout->addMultiCellWidget(m_clockApplet, 0, nbrOfLines - 1, col+1, col+1, - Qt::AlignHCenter | Qt::AlignVCenter); + TQt::AlignHCenter | TQt::AlignVCenter); } } diff --git a/kicker/applets/systemtray/systemtrayapplet.h b/kicker/applets/systemtray/systemtrayapplet.h index e311a1bdd..2b49ce93e 100644 --- a/kicker/applets/systemtray/systemtrayapplet.h +++ b/kicker/applets/systemtray/systemtrayapplet.h @@ -48,7 +48,7 @@ class TDEActionSelector; class SystemTrayApplet : public KPanelApplet, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP typedef TQValueVector<TrayEmbed*> TrayEmbedList; @@ -125,7 +125,7 @@ private: class TrayEmbed : public QXEmbed { - Q_OBJECT + TQ_OBJECT public: TrayEmbed( bool kdeTray, TQWidget* parent = NULL ); ~TrayEmbed(); diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp index 5673cb563..37a78a923 100644 --- a/kicker/applets/taskbar/taskbarapplet.cpp +++ b/kicker/applets/taskbar/taskbarapplet.cpp @@ -59,7 +59,7 @@ TaskbarApplet::TaskbarApplet( const TQString& configFile, Type type, int actions TQHBoxLayout* layout = new TQHBoxLayout( this ); container = new TaskBarContainer( false, configFile, this ); container->setBackgroundOrigin( AncestorOrigin ); - connect(container, TQT_SIGNAL(containerCountChanged()), this, TQT_SIGNAL(updateLayout())); + connect(container, TQ_SIGNAL(containerCountChanged()), this, TQ_SIGNAL(updateLayout())); layout->addWidget( container, 1 ); container->popupDirectionChange(popupDirection()); } @@ -72,14 +72,14 @@ TaskbarApplet::~TaskbarApplet() int TaskbarApplet::widthForHeight(int h) const { - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { return width(); } // FIXME KDE4: when either TaskBarContainer or Applet smartens up // simplify this - KPanelExtension::Position d = orientation() == Qt::Horizontal ? + KPanelExtension::Position d = orientation() == TQt::Horizontal ? KPanelExtension::Top : KPanelExtension::Left; return container->sizeHint(d, TQSize(200, h)).width(); @@ -87,14 +87,14 @@ int TaskbarApplet::widthForHeight(int h) const int TaskbarApplet::heightForWidth(int w) const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return height(); } // FIXME KDE4: when either TaskBarContainer or Applet smartens up // simplify this - KPanelExtension::Position d = orientation() == Qt::Horizontal ? + KPanelExtension::Position d = orientation() == TQt::Horizontal ? KPanelExtension::Top : KPanelExtension::Left; return container->sizeHint(d, TQSize(w, 200)).height(); diff --git a/kicker/applets/taskbar/taskbarapplet.h b/kicker/applets/taskbar/taskbarapplet.h index 9685b436b..6204e94f5 100644 --- a/kicker/applets/taskbar/taskbarapplet.h +++ b/kicker/applets/taskbar/taskbarapplet.h @@ -31,7 +31,7 @@ class TQPalette; class TaskbarApplet : public KPanelApplet { - Q_OBJECT + TQ_OBJECT public: TaskbarApplet( const TQString& configFile, Type t = Normal, int actions = 0, diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp index f431b8aed..9fe7eccf6 100644 --- a/kicker/applets/trash/trashapplet.cpp +++ b/kicker/applets/trash/trashapplet.cpp @@ -53,12 +53,12 @@ TrashApplet::TrashApplet(const TQString& configFile, Type type, int actions, TQW mpDirLister = new KDirLister(); - connect( mpDirLister, TQT_SIGNAL( clear() ), - this, TQT_SLOT( slotClear() ) ); - connect( mpDirLister, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotCompleted() ) ); - connect( mpDirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ), - this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) ); + connect( mpDirLister, TQ_SIGNAL( clear() ), + this, TQ_SLOT( slotClear() ) ); + connect( mpDirLister, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotCompleted() ) ); + connect( mpDirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ), + this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) ); mpDirLister->openURL("trash:/"); } @@ -67,8 +67,8 @@ TrashApplet::~TrashApplet() { // disconnect the dir lister before quitting so as not to crash // on kicker exit - disconnect( mpDirLister, TQT_SIGNAL( clear() ), - this, TQT_SLOT( slotClear() ) ); + disconnect( mpDirLister, TQ_SIGNAL( clear() ), + this, TQ_SLOT( slotClear() ) ); delete mpDirLister; TDEGlobal::locale()->removeCatalogue("trashapplet"); } @@ -121,12 +121,12 @@ void TrashApplet::resizeEvent( TQResizeEvent * ) int size = 1; size = std::max( size, - orientation() == Qt::Vertical ? + orientation() == TQt::Vertical ? mButton->heightForWidth( width() ) : mButton->widthForHeight( height() ) ); - if(orientation() == Qt::Vertical) + if(orientation() == TQt::Vertical) { mButton->resize( width(), size ); } diff --git a/kicker/applets/trash/trashapplet.h b/kicker/applets/trash/trashapplet.h index c77cf3755..124ae4310 100644 --- a/kicker/applets/trash/trashapplet.h +++ b/kicker/applets/trash/trashapplet.h @@ -33,7 +33,7 @@ class TrashApplet : public KPanelApplet { -Q_OBJECT +TQ_OBJECT public: TrashApplet(const TQString& configFile, Type t = Normal, int actions = 0, diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp index 85c0eef62..96efb7436 100644 --- a/kicker/applets/trash/trashbutton.cpp +++ b/kicker/applets/trash/trashbutton.cpp @@ -32,14 +32,14 @@ #include <konq_popupmenu.h> TrashButton::TrashButton(TQWidget *parent) - : PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)), + : PanelPopupButton(parent), mActions(this, this), mFileItem(KFileItem::Unknown, KFileItem::Unknown, "trash:/") { TDEIO::UDSEntry entry; TDEIO::NetAccess::stat("trash:/", entry, 0L); mFileItem.assign(KFileItem(entry, "trash:/")); - TDEAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), + TDEAction *a = KStdAction::paste(this, TQ_SLOT(slotPaste()), &mActions, "paste"); a->setShortcut(0); @@ -53,7 +53,7 @@ TrashButton::TrashButton(TQWidget *parent) // Activate this code only if we find a way to have both an // action and a popup menu for the same kicker button - //connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked())); + //connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked())); setPopup(new TQPopupMenu()); } diff --git a/kicker/applets/trash/trashbutton.h b/kicker/applets/trash/trashbutton.h index bbf596a0c..fa1ce7077 100644 --- a/kicker/applets/trash/trashbutton.h +++ b/kicker/applets/trash/trashbutton.h @@ -32,7 +32,7 @@ class TrashButton : public PanelPopupButton { -Q_OBJECT +TQ_OBJECT public: TrashButton(TQWidget *parent); diff --git a/kicker/data/icons/Makefile.am b/kicker/data/icons/Makefile.am index 4bc51ce73..a8a6a18cd 100644 --- a/kicker/data/icons/Makefile.am +++ b/kicker/data/icons/Makefile.am @@ -1,3 +1,3 @@ -KDE_ICON = kdisknav package_favourite panel window_list kmenu kicker +KDE_ICON = kdisknav package_favourite panel kmenu kicker SUBDIRS = actions diff --git a/kicker/data/icons/cr16-app-window_list.png b/kicker/data/icons/cr16-app-window_list.png Binary files differdeleted file mode 100644 index 33439e716..000000000 --- a/kicker/data/icons/cr16-app-window_list.png +++ /dev/null diff --git a/kicker/data/icons/cr32-app-window_list.png b/kicker/data/icons/cr32-app-window_list.png Binary files differdeleted file mode 100644 index 2de7c18db..000000000 --- a/kicker/data/icons/cr32-app-window_list.png +++ /dev/null diff --git a/kicker/data/icons/cr48-app-window_list.png b/kicker/data/icons/cr48-app-window_list.png Binary files differdeleted file mode 100644 index f19da6616..000000000 --- a/kicker/data/icons/cr48-app-window_list.png +++ /dev/null diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index 446991109..a5aeefa57 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/kicker/extensions/dockbar/dockbarextension.cpp @@ -57,8 +57,8 @@ DockBarExtension::DockBarExtension(const TQString& configFile, Type type, : KPanelExtension(configFile, type, actions, parent, name) { dragging_container = 0; - twin_module = new KWinModule(TQT_TQOBJECT(this)); - connect( twin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) ); + twin_module = new KWinModule(this); + connect( twin_module, TQ_SIGNAL( windowAdded(WId) ), TQ_SLOT( windowAdded(WId) ) ); setMinimumSize(DockContainer::sz(), DockContainer::sz()); setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); loadContainerConfig(); @@ -174,7 +174,7 @@ void DockBarExtension::layoutContainers() it != containers.constEnd(); ++it) { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) (*it)->move(DockContainer::sz() * i, 0); else (*it)->move(0, DockContainer::sz() * i); @@ -236,10 +236,10 @@ void DockBarExtension::addContainer(DockContainer* c, int pos) containers.insert(it, c); } - connect(c, TQT_SIGNAL(embeddedWindowDestroyed(DockContainer*)), - TQT_SLOT(embeddedWindowDestroyed(DockContainer*))); - connect(c, TQT_SIGNAL(settingsChanged(DockContainer*)), - TQT_SLOT(settingsChanged(DockContainer*))); + connect(c, TQ_SIGNAL(embeddedWindowDestroyed(DockContainer*)), + TQ_SLOT(embeddedWindowDestroyed(DockContainer*))); + connect(c, TQ_SIGNAL(settingsChanged(DockContainer*)), + TQ_SLOT(settingsChanged(DockContainer*))); c->resize(DockContainer::sz(), DockContainer::sz()); c->show(); } @@ -345,17 +345,17 @@ int DockBarExtension::findContainerAtPoint(const TQPoint& p) } void DockBarExtension::mousePressEvent(TQMouseEvent *e ) { - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { // Store the position of the mouse clic. mclic_pos = e->pos(); - } else if (e->button() == Qt::RightButton) { + } else if (e->button() == TQt::RightButton) { int pos = findContainerAtPoint(e->pos()); if (pos != -1) containers.at(pos)->popupMenu(e->globalPos()); } } void DockBarExtension::mouseReleaseEvent(TQMouseEvent *e ) { - if (e->button() != Qt::LeftButton) return; + if (e->button() != TQt::LeftButton) return; if (dragging_container) { releaseMouse(); original_container->embed(dragging_container->embeddedWinId()); @@ -366,7 +366,7 @@ void DockBarExtension::mouseReleaseEvent(TQMouseEvent *e ) { } void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) { - if (! (e->state() & Qt::LeftButton) ) return; + if (! (e->state() & TQt::LeftButton) ) return; if (dragging_container == 0) { // Check whether the user has moved far enough. int delay = TQApplication::startDragDistance(); @@ -393,7 +393,7 @@ void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) { int pdrag1,pdrag2,psz; pdrag1 = dragpos.x() - barpos.x() + DockContainer::sz()/2; pdrag2 = dragpos.y() - barpos.y() + DockContainer::sz()/2; - if (orientation() == Qt::Vertical) { + if (orientation() == TQt::Vertical) { int tmp = pdrag1; pdrag1 = pdrag2; pdrag2 = tmp; psz = height(); } else psz = width(); diff --git a/kicker/extensions/dockbar/dockbarextension.h b/kicker/extensions/dockbar/dockbarextension.h index 0952d259e..1431f29ee 100644 --- a/kicker/extensions/dockbar/dockbarextension.h +++ b/kicker/extensions/dockbar/dockbarextension.h @@ -32,7 +32,7 @@ class KWinModule; class DockBarExtension : public KPanelExtension { - Q_OBJECT + TQ_OBJECT public: DockBarExtension(const TQString& configFile, Type t = Normal, diff --git a/kicker/extensions/dockbar/dockcontainer.h b/kicker/extensions/dockbar/dockcontainer.h index 278b8e450..9ab21efb5 100644 --- a/kicker/extensions/dockbar/dockcontainer.h +++ b/kicker/extensions/dockbar/dockcontainer.h @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class DockContainer : public TQFrame { - Q_OBJECT + TQ_OBJECT public: typedef TQValueVector<DockContainer*> Vector; diff --git a/kicker/extensions/kasbar/docs.h b/kicker/extensions/kasbar/docs.h index 105176d08..8a5ded920 100644 --- a/kicker/extensions/kasbar/docs.h +++ b/kicker/extensions/kasbar/docs.h @@ -36,19 +36,19 @@ -class QObject +class TQObject { }; -class TQWidget : public QObject +class TQWidget : public TQObject { }; -class TQDialog : public QWidget +class TQDialog : public TQWidget { }; -class TQFrame : public QWidget +class TQFrame : public TQWidget { }; @@ -64,6 +64,6 @@ class KDialogBase : public QDialog { }; -class KPanelExtension : public QWidget +class KPanelExtension : public TQWidget { }; diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp index 1d15dc7c8..e1c9f4afc 100644 --- a/kicker/extensions/kasbar/kasaboutdlg.cpp +++ b/kicker/extensions/kasbar/kasaboutdlg.cpp @@ -118,7 +118,7 @@ void KasAboutDialog::addDemoBar() box->setSpacing( spacingHint() ); box->setMargin( marginHint() ); - KasBar *bar = new KasBar( Qt::Horizontal, box ); + KasBar *bar = new KasBar( TQt::Horizontal, box ); bar->setItemSize( KasBar::Large ); bar->setMasked( false ); @@ -129,9 +129,9 @@ void KasAboutDialog::addDemoBar() KasPopup *pop = new KasPopup( ci ); ci->setPopup( pop ); ci->setCustomPopup( true ); - connect( ci, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), ci, TQT_SLOT(togglePopup()) ); + connect( ci, TQ_SIGNAL(leftButtonClicked(TQMouseEvent *)), ci, TQ_SLOT(togglePopup()) ); - KasBar *groupbar = bar->createChildBar( ( bar->orientation() == Qt::Horizontal ) ? Qt::Vertical : Qt::Horizontal, pop ); + KasBar *groupbar = bar->createChildBar( ( bar->orientation() == TQt::Horizontal ) ? TQt::Vertical : TQt::Horizontal, pop ); KasItem *i = 0; KasClockItem *clk = new KasClockItem( groupbar ); diff --git a/kicker/extensions/kasbar/kasaboutdlg.h b/kicker/extensions/kasbar/kasaboutdlg.h index 0eb1a13f4..dda84045b 100644 --- a/kicker/extensions/kasbar/kasaboutdlg.h +++ b/kicker/extensions/kasbar/kasaboutdlg.h @@ -63,7 +63,7 @@ class KasBar; */ class KasAboutDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KasAboutDialog( TQWidget *parent=0 ); diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp index 87fc7c629..323a58150 100644 --- a/kicker/extensions/kasbar/kasbar.cpp +++ b/kicker/extensions/kasbar/kasbar.cpp @@ -80,7 +80,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f ) : TQWidget( parent, name, f ), master_(0), orient( o ), - direction_( o == Qt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ), + direction_( o == TQt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ), itemUnderMouse_( 0 ), boxesPerLine_(10), // Temp value inDrag( false ), @@ -102,14 +102,14 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f ) setMouseTracking( true ); setMaxBoxes( 0 ); - connect( this, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) ); + connect( this, TQ_SIGNAL( configChanged() ), TQ_SLOT( repaint() ) ); } KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *name, WFlags f ) : TQWidget( parent, name, f ), master_(master), orient( o ), - direction_( o == Qt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ), + direction_( o == TQt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ), itemUnderMouse_( 0 ), boxesPerLine_(10), // Temp value inDrag( false ), @@ -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_, TQ_SIGNAL( configChanged() ), TQ_SLOT( repaint() ) ); } KasBar::~KasBar() @@ -145,8 +145,8 @@ KasResources *KasBar::resources() if ( isTopLevel() ) { res = new KasResources( this ); - connect( res, TQT_SIGNAL( changed() ), TQT_SIGNAL( configChanged() ) ); - connect( this, TQT_SIGNAL( itemSizeChanged(int) ), res, TQT_SLOT( itemSizeChanged() ) ); + connect( res, TQ_SIGNAL( changed() ), TQ_SIGNAL( configChanged() ) ); + connect( this, TQ_SIGNAL( itemSizeChanged(int) ), res, TQ_SLOT( itemSizeChanged() ) ); return res; } @@ -218,8 +218,8 @@ void KasBar::setTransparent( bool enable ) kdDebug(1345) << "KasBar: Enabling transparency" << endl; rootPix = new KRootPixmap( this ); - connect( rootPix, TQT_SIGNAL( backgroundUpdated(const TQPixmap &) ), - this, TQT_SLOT( setBackground(const TQPixmap &) ) ); + connect( rootPix, TQ_SIGNAL( backgroundUpdated(const TQPixmap &) ), + this, TQ_SLOT( setBackground(const TQPixmap &) ) ); rootPix->setCustomPainting( true ); @@ -318,9 +318,9 @@ void KasBar::setDirection( Direction dir ) return; if ( ( dir == TQBoxLayout::LeftToRight ) || ( dir == TQBoxLayout::RightToLeft ) ) - orient = Qt::Horizontal; + orient = TQt::Horizontal; else - orient = Qt::Vertical; + orient = TQt::Vertical; direction_ = dir; emit directionChanged(); @@ -332,7 +332,7 @@ void KasBar::setOrientation( Orientation o ) if ( orient == o ) return; - if ( o == Qt::Horizontal ) + if ( o == TQt::Horizontal ) setDirection( TQBoxLayout::LeftToRight ); else setDirection( TQBoxLayout::TopToBottom ); @@ -377,7 +377,7 @@ void KasBar::setDetached( bool detach ) TQSize KasBar::sizeHint( Orientation o, TQSize sz ) { - if ( o == Qt::Horizontal ) + if ( o == TQt::Horizontal ) setBoxesPerLine( sz.width() / itemExtent() ); else setBoxesPerLine( sz.height() / itemExtent() ); @@ -396,7 +396,7 @@ TQSize KasBar::sizeHint( Orientation o, TQSize sz ) ++r; TQSize s; - if( o == Qt::Horizontal ) { + if( o == TQt::Horizontal ) { s.setWidth( c*itemExtent() ); s.setHeight( r*itemExtent() ); } @@ -434,7 +434,7 @@ void KasBar::updateLayout() ++r; TQSize sz; - if ( orient == Qt::Horizontal ) + if ( orient == TQt::Horizontal ) sz = TQSize( c * itemExtent(), r * itemExtent() ); else sz = TQSize( r * itemExtent(), c * itemExtent() ); @@ -449,7 +449,7 @@ void KasBar::updateLayout() TQRegion mask; KasItem *i; - if ( orient == Qt::Horizontal ) { + if ( orient == TQt::Horizontal ) { for ( i = items.first(); i; i = items.next() ) { int x = (items.at() % c) * itemExtent(); @@ -720,7 +720,7 @@ void KasBar::addTestItems() i->setIcon( TDEGlobal::iconLoader()->loadIcon( "icons", TDEIcon::NoGroup, TDEIcon::SizeMedium ) ); i->setAnimation( resources()->startupAnimation() ); TQTimer *aniTimer = new TQTimer( i, "aniTimer" ); - connect( aniTimer, TQT_SIGNAL( timeout() ), i, TQT_SLOT( advanceAnimation() ) ); + connect( aniTimer, TQ_SIGNAL( timeout() ), i, TQ_SLOT( advanceAnimation() ) ); aniTimer->start( 100 ); i->setShowAnimation( true ); diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h index 5d8ac3266..5aad7392a 100644 --- a/kicker/extensions/kasbar/kasbar.h +++ b/kicker/extensions/kasbar/kasbar.h @@ -74,7 +74,7 @@ typedef TQPtrList<KasItem> KasItemList; */ class KDE_EXPORT KasBar : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int maxBoxes READ maxBoxes ) TQ_PROPERTY( uint boxesPerLine READ boxesPerLine ) TQ_PROPERTY( Direction direction READ direction ) @@ -84,8 +84,8 @@ class KDE_EXPORT KasBar : public TQWidget friend class KasItem; public: - KasBar( Qt::Orientation o, TQWidget *parent=0, const char *name=0, WFlags f=0 ); - KasBar( Qt::Orientation o, KasBar *master, + KasBar( TQt::Orientation o, TQWidget *parent=0, const char *name=0, WFlags f=0 ); + KasBar( TQt::Orientation o, KasBar *master, TQWidget* parent=0, const char* name=0, WFlags f=0 ); virtual ~KasBar(); @@ -99,7 +99,7 @@ public: KasBar *master() const { return master_; } /** Creates a child bar of the kasbar. The child will inherit the appearance options. */ - virtual KasBar *createChildBar( Qt::Orientation o, TQWidget *parent, const char *name=0 ); + virtual KasBar *createChildBar( TQt::Orientation o, TQWidget *parent, const char *name=0 ); /** Factory method that returns the singleton resources object. */ virtual KasResources *resources(); @@ -136,8 +136,8 @@ public: int maxBoxes() const { return maxBoxes_; } uint boxesPerLine() const { return boxesPerLine_; } - void setOrientation( Qt::Orientation o ); - Qt::Orientation orientation() const { return orient; } + void setOrientation( TQt::Orientation o ); + TQt::Orientation orientation() const { return orient; } void setDirection( Direction dir ); Direction direction() const { return direction_; } @@ -147,7 +147,7 @@ public: bool isDrag() const { return inDrag; } - TQSize sizeHint( Qt::Orientation, TQSize max ); + TQSize sizeHint( TQt::Orientation, TQSize max ); // // Look and feel options @@ -282,7 +282,7 @@ private: TQPixmap offscreen; KasBar *master_; KasItemList items; - Qt::Orientation orient; + TQt::Orientation orient; Direction direction_; KasItem *itemUnderMouse_; uint boxesPerLine_; diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp index ebb2422d3..a9a5fd68a 100644 --- a/kicker/extensions/kasbar/kasbarapp.cpp +++ b/kicker/extensions/kasbar/kasbarapp.cpp @@ -88,7 +88,7 @@ int main( int argc, char **argv ) TDEConfig conf( "kasbarrc" ); if ( args->isSet("test") ) { - kasbar = new KasBar( Qt::Vertical, 0, "testkas", (TQ_WFlags)wflags ); + kasbar = new KasBar( TQt::Vertical, 0, "testkas", (TQt::WFlags)wflags ); kasbar->setItemSize( KasBar::Large ); kasbar->append( new KasClockItem(kasbar) ); kasbar->append( new KasItem(kasbar) ); @@ -97,14 +97,14 @@ int main( int argc, char **argv ) kasbar->addTestItems(); } else { - KasTasker *kastasker = new KasTasker( Qt::Vertical, 0, "testkas", (TQ_WFlags)wflags ); + KasTasker *kastasker = new KasTasker( TQt::Vertical, 0, "testkas", (TQt::WFlags)wflags ); kastasker->setConfig( &conf ); kastasker->setStandAlone( true ); kasbar = kastasker; kastasker->readConfig(); kastasker->move( kastasker->detachedPosition() ); - kastasker->connect( kastasker->resources(), TQT_SIGNAL(changed()), TQT_SLOT(readConfig()) ); + kastasker->connect( kastasker->resources(), TQ_SIGNAL(changed()), TQ_SLOT(readConfig()) ); kastasker->refreshAll(); } @@ -118,7 +118,7 @@ int main( int argc, char **argv ) TDEApplication::kApplication()->dcopClient()->registerAs( "kasbar" ); - app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) ); + app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), TQ_SLOT(quit()) ); return app.exec(); } diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp index 5d870dae6..327fd564c 100644 --- a/kicker/extensions/kasbar/kasbarextension.cpp +++ b/kicker/extensions/kasbar/kasbarextension.cpp @@ -97,8 +97,8 @@ KasBarExtension::KasBarExtension( const TQString& configFile, // setBackgroundMode( NoBackground ); kasbar = new KasTasker( orientation(), this, name ); - connect( kasbar, TQT_SIGNAL( layoutChanged() ), this, TQT_SIGNAL( updateLayout() ) ); - connect( kasbar, TQT_SIGNAL( detachedChanged(bool) ), this, TQT_SLOT( setDetached(bool) ) ); + connect( kasbar, TQ_SIGNAL( layoutChanged() ), this, TQ_SIGNAL( updateLayout() ) ); + connect( kasbar, TQ_SIGNAL( detachedChanged(bool) ), this, TQ_SLOT( setDetached(bool) ) ); kasbar->setConfig( config() ); kasbar->readConfig(); @@ -146,7 +146,7 @@ void KasBarExtension::showEvent( TQShowEvent */*se*/ ) TQSize KasBarExtension::detachedSize() { - if ( orientation() == Qt::Vertical ) + if ( orientation() == TQt::Vertical ) return TQSize( kasbar->itemExtent()/2, 0 ); else return TQSize( 0, kasbar->itemExtent()/2 ); @@ -155,13 +155,13 @@ TQSize KasBarExtension::detachedSize() TQSize KasBarExtension::sizeHint(Position p, TQSize maxSize ) const { - Orientation o = Qt::Horizontal; + Orientation o = TQt::Horizontal; if ( p == Left || p == Right ) - o = Qt::Vertical; + o = TQt::Vertical; if ( detached_ ) { - if ( o == Qt::Vertical ) + if ( o == TQt::Vertical ) return TQSize( kasbar->itemExtent()/2, 0 ); else return TQSize( 0, kasbar->itemExtent()/2 ); diff --git a/kicker/extensions/kasbar/kasbarextension.h b/kicker/extensions/kasbar/kasbarextension.h index e5700eeea..c1786c953 100644 --- a/kicker/extensions/kasbar/kasbarextension.h +++ b/kicker/extensions/kasbar/kasbarextension.h @@ -64,7 +64,7 @@ class KasTasker; */ class KasBarExtension : public KPanelExtension { - Q_OBJECT + TQ_OBJECT public: KasBarExtension( const TQString& configFile, diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp index 249e7c051..a99c5f8ba 100644 --- a/kicker/extensions/kasbar/kasclockitem.cpp +++ b/kicker/extensions/kasbar/kasclockitem.cpp @@ -39,7 +39,7 @@ KasClockItem::KasClockItem( KasBar *parent ) setCustomPopup( true ); TQTimer *t = new TQTimer( this, "t" ); - connect( t, TQT_SIGNAL( timeout() ), TQT_SLOT( updateTime() ) ); + connect( t, TQ_SIGNAL( timeout() ), TQ_SLOT( updateTime() ) ); t->start( 1000 ); lcd = new LCD( parent ); @@ -53,8 +53,8 @@ KasClockItem::KasClockItem( KasBar *parent ) lcd->setAutoMask( true ); updateTime(); - connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) ); - connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showMenuAt(TQMouseEvent *) ) ); + connect( this, TQ_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQ_SLOT(togglePopup()) ); + connect( this, TQ_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQ_SLOT(showMenuAt(TQMouseEvent *) ) ); } KasClockItem::~KasClockItem() diff --git a/kicker/extensions/kasbar/kasclockitem.h b/kicker/extensions/kasbar/kasclockitem.h index a020608b0..b6b263318 100644 --- a/kicker/extensions/kasbar/kasclockitem.h +++ b/kicker/extensions/kasbar/kasclockitem.h @@ -8,7 +8,7 @@ */ class KDE_EXPORT KasClockItem : public KasItem { - Q_OBJECT + TQ_OBJECT public: KasClockItem( KasBar *parent ); diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp index a14dff2ea..de59f7b88 100644 --- a/kicker/extensions/kasbar/kasgroupitem.cpp +++ b/kicker/extensions/kasbar/kasgroupitem.cpp @@ -83,10 +83,10 @@ KasGroupItem::KasGroupItem( KasTasker *parent ) setGroupItem( true ); setText( i18n("Group") ); - connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( hidePopup() ) ); - connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( update() ) ); - connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) ); - connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showGroupMenuAt(TQMouseEvent *) ) ); + connect( parent, TQ_SIGNAL( layoutChanged() ), this, TQ_SLOT( hidePopup() ) ); + connect( parent, TQ_SIGNAL( layoutChanged() ), this, TQ_SLOT( update() ) ); + connect( this, TQ_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQ_SLOT(togglePopup()) ); + connect( this, TQ_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQ_SLOT(showGroupMenuAt(TQMouseEvent *) ) ); } KasGroupItem::~KasGroupItem() @@ -109,7 +109,7 @@ void KasGroupItem::addTask( Task::Ptr t ) updateIcon(); } - connect( t, TQT_SIGNAL( changed(bool) ), this, TQT_SLOT( update() ) ); + connect( t, TQ_SIGNAL( changed(bool) ), this, TQ_SLOT( update() ) ); update(); } @@ -255,9 +255,9 @@ void KasGroupItem::updatePopup() KasPopup *KasGroupItem::createPopup() { KasPopup *pop = new KasPopup( this ); - bar = kasbar()->createChildBar( ( kasbar()->orientation() == Qt::Horizontal ) ? Qt::Vertical : Qt::Horizontal, pop ); + bar = kasbar()->createChildBar( ( kasbar()->orientation() == TQt::Horizontal ) ? TQt::Vertical : TQt::Horizontal, pop ); - connect( pop, TQT_SIGNAL(shown()), TQT_SLOT(updatePopup()) ); + connect( pop, TQ_SIGNAL(shown()), TQ_SLOT(updatePopup()) ); return pop; @@ -291,7 +291,7 @@ void KasGroupItem::showGroupMenuAt( TQMouseEvent *ev ) void KasGroupItem::showGroupMenuAt( const TQPoint &p ) { TaskRMBMenu *tm = new TaskRMBMenu(items, true, NULL, kasbar()); - tm->insertItem( i18n("&Ungroup" ), this, TQT_SLOT( ungroup() ) ); + tm->insertItem( i18n("&Ungroup" ), this, TQ_SLOT( ungroup() ) ); tm->insertSeparator(); tm->insertItem( i18n("&Kasbar"), kasbar()->contextMenu() ); diff --git a/kicker/extensions/kasbar/kasgroupitem.h b/kicker/extensions/kasbar/kasgroupitem.h index 33d913430..2acad3004 100644 --- a/kicker/extensions/kasbar/kasgroupitem.h +++ b/kicker/extensions/kasbar/kasgroupitem.h @@ -68,7 +68,7 @@ class Task; */ class KasGroupItem : public KasItem { - Q_OBJECT + TQ_OBJECT public: enum GroupType { diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp index 2523ef18c..a95dac049 100644 --- a/kicker/extensions/kasbar/kasitem.cpp +++ b/kicker/extensions/kasbar/kasitem.cpp @@ -94,8 +94,8 @@ KasItem::KasItem( KasBar *parent ) frame(true), modified(false), attention_(false), prog( -1 ), anim(), aniFrame( 0 ), drawAnim( false ) { - connect( parent, TQT_SIGNAL( dragStarted() ), TQT_SLOT( hidePopup() ) ); - connect( this, TQT_SIGNAL( middleButtonClicked(TQMouseEvent *) ), parent, TQT_SLOT( toggleOrientation() ) ); + connect( parent, TQ_SIGNAL( dragStarted() ), TQ_SLOT( hidePopup() ) ); + connect( this, TQ_SIGNAL( middleButtonClicked(TQMouseEvent *) ), parent, TQ_SLOT( toggleOrientation() ) ); } KasItem::~KasItem() @@ -169,7 +169,7 @@ void KasItem::mouseEnter() if ( (!customPopup) && (popupTimer == 0) ) { popupTimer = new TQTimer( this, "popupTimer" ); - connect( popupTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( showPopup() ) ); + connect( popupTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( showPopup() ) ); popupTimer->start( POPUP_DELAY, true ); } @@ -179,11 +179,11 @@ void KasItem::mouseEnter() void KasItem::mouseReleaseEvent( TQMouseEvent *ev ) { - if ( ev->button() == Qt::LeftButton ) + if ( ev->button() == TQt::LeftButton ) emit leftButtonClicked( ev ); - else if ( ev->button() == Qt::RightButton ) + else if ( ev->button() == TQt::RightButton ) emit rightButtonClicked( ev ); - else if ( ev->button() == Qt::MidButton ) + else if ( ev->button() == TQt::MidButton ) emit middleButtonClicked( ev ); } @@ -205,7 +205,7 @@ void KasItem::checkPopup() hidePopup(); } else { - TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQT_SLOT( checkPopup() ) ); + TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQ_SLOT( checkPopup() ) ); } } @@ -215,7 +215,7 @@ void KasItem::dragEnter() if ( dragTimer == 0 ) { dragTimer = new TQTimer( this, "dragTimer" ); - connect( dragTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( dragOverAction() ) ); + connect( dragTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( dragOverAction() ) ); dragTimer->start( DRAG_SWITCH_DELAY, true ); } @@ -268,7 +268,7 @@ void KasItem::showPopup() pop->show(); update(); - TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQT_SLOT( checkPopup() ) ); + TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQ_SLOT( checkPopup() ) ); } void KasItem::hidePopup() @@ -312,13 +312,13 @@ void KasItem::paintFrame( TQPainter *p ) p->drawRect( 0, 0, extent(), extent()); } else { - pen = TQPen( Qt::white ); + pen = TQPen( TQt::white ); p->setPen( pen ); p->drawRect(0, 0, extent(), extent()); } } else if ( kas->paintInactiveFrames() ) { - p->setPen( attention_ ? resources()->attentionColor() : Qt::black ); + p->setPen( attention_ ? resources()->attentionColor() : TQt::black ); p->drawRect(0, 0, extent(), extent()); } } diff --git a/kicker/extensions/kasbar/kasitem.h b/kicker/extensions/kasbar/kasitem.h index 4408227cb..508955f9d 100644 --- a/kicker/extensions/kasbar/kasitem.h +++ b/kicker/extensions/kasbar/kasitem.h @@ -75,7 +75,7 @@ class KasPopup; */ class KDE_EXPORT KasItem : public TQObject { - Q_OBJECT + TQ_OBJECT public: friend class KasBar; diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp index 6169d09b1..450d80154 100644 --- a/kicker/extensions/kasbar/kasloaditem.cpp +++ b/kicker/extensions/kasbar/kasloaditem.cpp @@ -34,11 +34,11 @@ KasLoadItem::KasLoadItem( KasBar *parent ) : KasItem( parent ) { TQTimer *t = new TQTimer( this, "KasLoadItem::t" ); - connect( t, TQT_SIGNAL( timeout() ), TQT_SLOT( updateDisplay() ) ); + connect( t, TQ_SIGNAL( timeout() ), TQ_SLOT( updateDisplay() ) ); t->start( 1000 ); updateDisplay(); - connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showMenuAt(TQMouseEvent *) ) ); + connect( this, TQ_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQ_SLOT(showMenuAt(TQMouseEvent *) ) ); } KasLoadItem::~KasLoadItem() diff --git a/kicker/extensions/kasbar/kasloaditem.h b/kicker/extensions/kasbar/kasloaditem.h index 0b7312ab6..91af06080 100644 --- a/kicker/extensions/kasbar/kasloaditem.h +++ b/kicker/extensions/kasbar/kasloaditem.h @@ -10,7 +10,7 @@ */ class KDE_EXPORT KasLoadItem : public KasItem { - Q_OBJECT + TQ_OBJECT public: KasLoadItem( KasBar *parent ); diff --git a/kicker/extensions/kasbar/kaspopup.cpp b/kicker/extensions/kasbar/kaspopup.cpp index 0edc0a77a..33966bdb9 100644 --- a/kicker/extensions/kasbar/kaspopup.cpp +++ b/kicker/extensions/kasbar/kaspopup.cpp @@ -95,7 +95,7 @@ TQPoint KasPopup::calcPosition( KasItem *item, int w, int h ) int x = pos.x(); int y = pos.y(); - if ( kasbar->orientation() == Qt::Horizontal ) { + if ( kasbar->orientation() == TQt::Horizontal ) { if ( y < ( tqApp->desktop()->height() / 2 ) ) y = y + kasbar->itemExtent(); else diff --git a/kicker/extensions/kasbar/kaspopup.h b/kicker/extensions/kasbar/kaspopup.h index 2de7ee6bd..701ca01dd 100644 --- a/kicker/extensions/kasbar/kaspopup.h +++ b/kicker/extensions/kasbar/kaspopup.h @@ -69,7 +69,7 @@ class KasBar; */ class KasPopup : public TQHBox { - Q_OBJECT + TQ_OBJECT public: KasPopup( KasItem *item, const char *name=0 ); diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp index 28c6fca72..cce36b250 100644 --- a/kicker/extensions/kasbar/kasprefsdlg.cpp +++ b/kicker/extensions/kasbar/kasprefsdlg.cpp @@ -134,9 +134,9 @@ void KasPrefsDialog::addLookPage() itemSizeLabel->setBuddy( itemSizeCombo ); - connect( itemSizeCombo, TQT_SIGNAL( activated( int ) ), - kasbar, TQT_SLOT( setItemSize( int ) ) ); - connect( itemSizeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( itemSizeChanged( int ) ) ); + connect( itemSizeCombo, TQ_SIGNAL( activated( int ) ), + kasbar, TQ_SLOT( setItemSize( int ) ) ); + connect( itemSizeCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( itemSizeChanged( int ) ) ); new TQWidget( itemSizeBox ); @@ -144,10 +144,10 @@ void KasPrefsDialog::addLookPage() customSize->setValue( kasbar->itemExtent() ); - connect( customSize, TQT_SIGNAL( valueChanged( int ) ), - kasbar, TQT_SLOT( setItemExtent( int ) ) ); - connect( customSize, TQT_SIGNAL( valueChanged( int ) ), - kasbar, TQT_SLOT( customSizeChanged( int ) ) ); + connect( customSize, TQ_SIGNAL( valueChanged( int ) ), + kasbar, TQ_SLOT( setItemExtent( int ) ) ); + connect( customSize, TQ_SIGNAL( valueChanged( int ) ), + kasbar, TQ_SLOT( customSizeChanged( int ) ) ); int sz = kasbar->itemSize(); itemSizeCombo->setCurrentItem( sz ); @@ -171,7 +171,7 @@ void KasPrefsDialog::addLookPage() conf ? conf->readNumEntry( "MaxBoxes", 0 ) : 11, 10, maxBoxesBox, "maxboxes" ); - connect( maxBoxesSpin, TQT_SIGNAL( valueChanged( int ) ), kasbar, TQT_SLOT( setMaxBoxes( int ) ) ); + connect( maxBoxesSpin, TQ_SIGNAL( valueChanged( int ) ), kasbar, TQ_SLOT( setMaxBoxes( int ) ) ); maxBoxesLabel->setBuddy( maxBoxesSpin ); // @@ -183,7 +183,7 @@ void KasPrefsDialog::addLookPage() detachedCheck->setEnabled( !kasbar->isStandAlone() ); detachedCheck->setChecked( kasbar->isDetached() ); - connect( detachedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setDetached(bool) ) ); + connect( detachedCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setDetached(bool) ) ); (void) new TQWidget( lookPage, "spacer" ); (void) new TQWidget( lookPage, "spacer" ); @@ -197,40 +197,40 @@ void KasPrefsDialog::addBackgroundPage() transCheck = new TQCheckBox( i18n("Trans&parent"), bgPage ); TQWhatsThis::add( transCheck, i18n( "Enables pseudo-transparent mode." ) ); transCheck->setChecked( kasbar->isTransparent() ); - connect( transCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setTransparent(bool) ) ); + connect( transCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setTransparent(bool) ) ); tintCheck = new TQCheckBox( i18n("Enable t&int"), bgPage ); TQWhatsThis::add( tintCheck, i18n( "Enables tinting the background that shows through in transparent mode." ) ); tintCheck->setChecked( kasbar->hasTint() ); - connect( tintCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setTint(bool) ) ); + connect( tintCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setTint(bool) ) ); TQHBox *tintColBox = new TQHBox( bgPage ); TQWhatsThis::add( tintColBox, i18n( "Specifies the color used for the background tint." ) ); - connect( tintCheck, TQT_SIGNAL( toggled(bool) ), tintColBox, TQT_SLOT( setEnabled(bool) ) ); + connect( tintCheck, TQ_SIGNAL( toggled(bool) ), tintColBox, TQ_SLOT( setEnabled(bool) ) ); tintColBox->setEnabled( kasbar->hasTint() ); TQLabel *tintLabel = new TQLabel( i18n("Tint &color:"), tintColBox ); tintButton = new KColorButton( kasbar->tintColor(), tintColBox ); - connect( tintButton, TQT_SIGNAL( changed( const TQColor & ) ), - kasbar, TQT_SLOT( setTintColor( const TQColor & ) ) ); + connect( tintButton, TQ_SIGNAL( changed( const TQColor & ) ), + kasbar, TQ_SLOT( setTintColor( const TQColor & ) ) ); tintLabel->setBuddy( tintButton ); TQHBox *tintAmtBox = new TQHBox( bgPage ); TQWhatsThis::add( tintAmtBox, i18n( "Specifies the strength of the background tint." ) ); - connect( tintCheck, TQT_SIGNAL( toggled(bool) ), tintAmtBox, TQT_SLOT( setEnabled(bool) ) ); + connect( tintCheck, TQ_SIGNAL( toggled(bool) ), tintAmtBox, TQ_SLOT( setEnabled(bool) ) ); tintAmtBox->setEnabled( kasbar->hasTint() ); TQLabel *tintStrengthLabel = new TQLabel( i18n("Tint &strength: "), tintAmtBox ); int percent = (int) (kasbar->tintAmount() * 100.0); - tintAmount = new TQSlider( 0, 100, 1, percent, Qt::Horizontal, tintAmtBox ); + tintAmount = new TQSlider( 0, 100, 1, percent, TQt::Horizontal, tintAmtBox ); tintAmount->setTracking( true ); - connect( tintAmount, TQT_SIGNAL( valueChanged( int ) ), - kasbar, TQT_SLOT( setTintAmount( int ) ) ); + connect( tintAmount, TQ_SIGNAL( valueChanged( int ) ), + kasbar, TQ_SLOT( setTintAmount( int ) ) ); tintStrengthLabel->setBuddy( tintAmount ); (void) new TQWidget( bgPage, "spacer" ); @@ -249,11 +249,11 @@ void KasPrefsDialog::addThumbsPage() "approximate, and may not reflect the current window contents.\n\n" "Using this option on a slow machine may cause performance problems." ) ); thumbsCheck->setChecked( kasbar->thumbnailsEnabled() ); - connect( thumbsCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setThumbnailsEnabled(bool) ) ); + connect( thumbsCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setThumbnailsEnabled(bool) ) ); embedThumbsCheck = new TQCheckBox( i18n("&Embed thumbnails"), thumbsPage ); embedThumbsCheck->setChecked( kasbar->embedThumbnails() ); - connect( embedThumbsCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setEmbedThumbnails(bool) ) ); + connect( embedThumbsCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setEmbedThumbnails(bool) ) ); TQHBox *thumbSizeBox = new TQHBox( thumbsPage ); TQWhatsThis::add( thumbSizeBox, @@ -261,9 +261,9 @@ void KasPrefsDialog::addThumbsPage() "cause performance problems." ) ); TQLabel *thumbSizeLabel = new TQLabel( i18n("Thumbnail &size: "), thumbSizeBox ); int percent = (int) (kasbar->thumbnailSize() * 100.0); - thumbSizeSlider = new TQSlider( 0, 100, 1, percent, Qt::Horizontal, thumbSizeBox ); - connect( thumbSizeSlider, TQT_SIGNAL( valueChanged( int ) ), - kasbar, TQT_SLOT( setThumbnailSize( int ) ) ); + thumbSizeSlider = new TQSlider( 0, 100, 1, percent, TQt::Horizontal, thumbSizeBox ); + connect( thumbSizeSlider, TQ_SIGNAL( valueChanged( int ) ), + kasbar, TQ_SLOT( setThumbnailSize( int ) ) ); thumbSizeLabel->setBuddy( thumbSizeSlider ); TQHBox *thumbUpdateBox = new TQHBox( thumbsPage ); @@ -275,8 +275,8 @@ void KasPrefsDialog::addThumbsPage() TQLabel *thumbUpdateLabel = new TQLabel( i18n("&Update thumbnail every: "), thumbUpdateBox ); thumbUpdateSpin = new TQSpinBox( 0, 1000, 1, thumbUpdateBox ); thumbUpdateSpin->setValue( kasbar->thumbnailUpdateDelay() ); - connect( thumbUpdateSpin, TQT_SIGNAL( valueChanged( int ) ), - kasbar, TQT_SLOT( setThumbnailUpdateDelay( int ) ) ); + connect( thumbUpdateSpin, TQ_SIGNAL( valueChanged( int ) ), + kasbar, TQ_SLOT( setThumbnailUpdateDelay( int ) ) ); (void) new TQLabel( i18n("seconds"), thumbUpdateBox ); thumbUpdateLabel->setBuddy( thumbUpdateSpin ); @@ -287,27 +287,27 @@ void KasPrefsDialog::addThumbsPage() void KasPrefsDialog::addBehavePage() { - TQVBox *behavePage = addVBoxPage( i18n("Behavior"), TQString::null, Icon( "window_list" ) ); + TQVBox *behavePage = addVBoxPage( i18n("Behavior"), TQString::null, Icon( "window_duplicate" ) ); groupWindowsCheck = new TQCheckBox( i18n("&Group windows"), behavePage ); TQWhatsThis::add( groupWindowsCheck, i18n( "Enables the grouping together of related windows." ) ); groupWindowsCheck->setChecked( kasbar->groupWindows() ); - connect( groupWindowsCheck, TQT_SIGNAL( toggled(bool) ), - kasbar, TQT_SLOT( setGroupWindows(bool) ) ); + connect( groupWindowsCheck, TQ_SIGNAL( toggled(bool) ), + kasbar, TQ_SLOT( setGroupWindows(bool) ) ); showAllWindowsCheck = new TQCheckBox( i18n("Show all &windows"), behavePage ); TQWhatsThis::add( showAllWindowsCheck, i18n( "Enables the display of all windows, not just those on the current desktop." ) ); showAllWindowsCheck->setChecked( kasbar->showAllWindows() ); - connect( showAllWindowsCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowAllWindows(bool) ) ); + connect( showAllWindowsCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setShowAllWindows(bool) ) ); groupInactiveCheck = new TQCheckBox( i18n("&Group windows on inactive desktops"), behavePage ); TQWhatsThis::add( groupInactiveCheck, i18n( "Enables the grouping together of windows that are not on the current desktop." ) ); groupInactiveCheck->setChecked( kasbar->groupInactiveDesktops() ); - connect( groupInactiveCheck, TQT_SIGNAL( toggled(bool) ), - kasbar, TQT_SLOT( setGroupInactiveDesktops(bool) ) ); + connect( groupInactiveCheck, TQ_SIGNAL( toggled(bool) ), + kasbar, TQ_SLOT( setGroupInactiveDesktops(bool) ) ); onlyShowMinimizedCheck = new TQCheckBox( i18n("Only show &minimized windows"), behavePage ); TQWhatsThis::add( onlyShowMinimizedCheck, @@ -315,7 +315,7 @@ void KasPrefsDialog::addBehavePage() "This gives Kasbar similar behavior to the icon handling in older environments " \ "like CDE or OpenLook." ) ); onlyShowMinimizedCheck->setChecked( kasbar->onlyShowMinimized() ); - connect( onlyShowMinimizedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setOnlyShowMinimized(bool) ) ); + connect( onlyShowMinimizedCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setOnlyShowMinimized(bool) ) ); (void) new TQWidget( behavePage, "spacer" ); (void) new TQWidget( behavePage, "spacer" ); @@ -331,14 +331,14 @@ void KasPrefsDialog::addColorsPage() TQLabel *labelPenLabel = new TQLabel( i18n("Label foreground:"), group ); labelPenButton = new KColorButton( res->labelPenColor(), group ); - connect( labelPenButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setLabelPenColor( const TQColor & ) ) ); + connect( labelPenButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setLabelPenColor( const TQColor & ) ) ); labelPenLabel->setBuddy( labelPenButton ); TQLabel *labelBackgroundLabel = new TQLabel( i18n("Label background:"), group ); labelBackgroundButton = new KColorButton( res->labelBgColor(), group ); - connect( labelBackgroundButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setLabelBgColor( const TQColor & ) ) ); + connect( labelBackgroundButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setLabelBgColor( const TQColor & ) ) ); labelBackgroundLabel->setBuddy( labelBackgroundButton ); // Inactive colors @@ -346,14 +346,14 @@ void KasPrefsDialog::addColorsPage() TQLabel *inactivePenLabel = new TQLabel( i18n("Inactive foreground:"), group ); inactivePenButton = new KColorButton( res->inactivePenColor(), group ); - connect( inactivePenButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setInactivePenColor( const TQColor & ) ) ); + connect( inactivePenButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setInactivePenColor( const TQColor & ) ) ); inactivePenLabel->setBuddy( inactivePenButton ); TQLabel *inactiveBgLabel = new TQLabel( i18n("Inactive background:"), group ); inactiveBgButton = new KColorButton( res->inactiveBgColor(), group ); - connect( inactiveBgButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setInactiveBgColor( const TQColor & ) ) ); + connect( inactiveBgButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setInactiveBgColor( const TQColor & ) ) ); inactiveBgLabel->setBuddy( inactiveBgButton ); // Active colors @@ -361,28 +361,28 @@ void KasPrefsDialog::addColorsPage() TQLabel *activePenLabel = new TQLabel( i18n("Active foreground:"), group ); activePenButton = new KColorButton( res->activePenColor(), group ); - connect( activePenButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setActivePenColor( const TQColor & ) ) ); + connect( activePenButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setActivePenColor( const TQColor & ) ) ); activePenLabel->setBuddy( activePenButton ); TQLabel *activeBgLabel = new TQLabel( i18n("Active background:"), group ); activeBgButton = new KColorButton( res->activeBgColor(), group ); - connect( activeBgButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setActiveBgColor( const TQColor & ) ) ); + connect( activeBgButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setActiveBgColor( const TQColor & ) ) ); activeBgLabel->setBuddy( activeBgButton ); group = new TQGrid( 2, colorsPage ); TQLabel *progressLabel = new TQLabel( i18n("&Progress color:"), group ); progressButton = new KColorButton( res->progressColor(), group ); - connect( progressButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setProgressColor( const TQColor & ) ) ); + connect( progressButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setProgressColor( const TQColor & ) ) ); progressLabel->setBuddy( progressButton ); TQLabel *attentionLabel = new TQLabel( i18n("&Attention color:"), group ); attentionButton = new KColorButton( res->attentionColor(), group ); - connect( attentionButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setAttentionColor( const TQColor & ) ) ); + connect( attentionButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setAttentionColor( const TQColor & ) ) ); attentionLabel->setBuddy( attentionButton ); (void) new TQWidget( colorsPage, "spacer" ); @@ -406,7 +406,7 @@ void KasPrefsDialog::addAdvancedPage() i18n( "Enables the display of tasks that are starting but have not yet " "created a window." ) ); notifierCheck->setChecked( kasbar->notifierEnabled() ); - connect( notifierCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setNotifierEnabled(bool) ) ); + connect( notifierCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setNotifierEnabled(bool) ) ); // Status advanced modifiedCheck = new TQCheckBox( i18n("Enable &modified indicator"), advancedPage ); @@ -414,26 +414,26 @@ void KasPrefsDialog::addAdvancedPage() i18n( "Enables the display of a floppy disk state icon for windows containing " "a modified document." ) ); modifiedCheck->setChecked( kasbar->showModified() ); - connect( modifiedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowModified(bool) ) ); + connect( modifiedCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setShowModified(bool) ) ); progressCheck = new TQCheckBox( i18n("Enable &progress indicator"), advancedPage ); TQWhatsThis::add( progressCheck, i18n( "Enables the display of a progress indicator in the label of windows." ) ); progressCheck->setChecked( kasbar->showProgress() ); - connect( progressCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowProgress(bool) ) ); + connect( progressCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setShowProgress(bool) ) ); attentionCheck = new TQCheckBox( i18n("Enable &attention indicator"), advancedPage ); TQWhatsThis::add( attentionCheck, i18n( "Enables the display of an icon that indicates a window that needs attention." ) ); attentionCheck->setChecked( kasbar->showAttention() ); - connect( attentionCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowAttention(bool) ) ); + connect( attentionCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setShowAttention(bool) ) ); inactiveFramesCheck = new TQCheckBox( i18n("Enable frames for inactive items"), advancedPage ); TQWhatsThis::add( inactiveFramesCheck, i18n( "Enables frames around inactive items, if you want the bar to disappear into " \ "the background you should probably uncheck this option." ) ); inactiveFramesCheck->setChecked( kasbar->paintInactiveFrames() ); - connect( inactiveFramesCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setPaintInactiveFrames(bool) ) ); + connect( inactiveFramesCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setPaintInactiveFrames(bool) ) ); (void) new TQWidget( advancedPage, "spacer" ); (void) new TQWidget( advancedPage, "spacer" ); diff --git a/kicker/extensions/kasbar/kasprefsdlg.h b/kicker/extensions/kasbar/kasprefsdlg.h index 05ad8c3a7..b35e96bed 100644 --- a/kicker/extensions/kasbar/kasprefsdlg.h +++ b/kicker/extensions/kasbar/kasprefsdlg.h @@ -72,7 +72,7 @@ class KasResources; */ class KasPrefsDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KasPrefsDialog( KasTasker *kas, TQWidget *parent=0 ); diff --git a/kicker/extensions/kasbar/kasresources.cpp b/kicker/extensions/kasbar/kasresources.cpp index 78b25e8c0..219c324fb 100644 --- a/kicker/extensions/kasbar/kasresources.cpp +++ b/kicker/extensions/kasbar/kasresources.cpp @@ -126,10 +126,10 @@ static const char *micro_shade[]={ KasResources::KasResources( KasBar *parent, const char *name ) : TQObject( parent, name ? name : "kasbar_resources" ), kasbar( parent ), - labelPenColor_( Qt::white ), labelBgColor_( Qt::black ), - activePenColor_( Qt::black ), activeBgColor_( Qt::white ), - inactivePenColor_( Qt::black ), inactiveBgColor_( Qt::white ), - progressColor_( Qt::green ), attentionColor_( Qt::red ), + labelPenColor_( TQt::white ), labelBgColor_( TQt::black ), + activePenColor_( TQt::black ), activeBgColor_( TQt::white ), + inactivePenColor_( TQt::black ), inactiveBgColor_( TQt::white ), + progressColor_( TQt::green ), attentionColor_( TQt::red ), startupFrames_() { } diff --git a/kicker/extensions/kasbar/kasresources.h b/kicker/extensions/kasbar/kasresources.h index e82c1b9e0..81f06086c 100644 --- a/kicker/extensions/kasbar/kasresources.h +++ b/kicker/extensions/kasbar/kasresources.h @@ -73,7 +73,7 @@ class KasBar; */ class KasResources : public TQObject { - Q_OBJECT + TQ_OBJECT public: KasResources( KasBar *parent, const char *name=0 ); diff --git a/kicker/extensions/kasbar/kasstartupitem.cpp b/kicker/extensions/kasbar/kasstartupitem.cpp index 2f008d0c5..84e17dd21 100644 --- a/kicker/extensions/kasbar/kasstartupitem.cpp +++ b/kicker/extensions/kasbar/kasstartupitem.cpp @@ -80,7 +80,7 @@ KasStartupItem::KasStartupItem( KasBar *parent, Startup::Ptr startup ) setAnimation( resources()->startupAnimation() ); aniTimer = new TQTimer( this, "aniTimer" ); - connect( aniTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( aniTimerFired() ) ); + connect( aniTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( aniTimerFired() ) ); aniTimer->start( 100 ); } diff --git a/kicker/extensions/kasbar/kasstartupitem.h b/kicker/extensions/kasbar/kasstartupitem.h index 4c0ade4e2..24cf4fe60 100644 --- a/kicker/extensions/kasbar/kasstartupitem.h +++ b/kicker/extensions/kasbar/kasstartupitem.h @@ -67,7 +67,7 @@ class TQTimer; */ class KasStartupItem : public KasItem { - Q_OBJECT + TQ_OBJECT public: KasStartupItem( KasBar *parent, Startup::Ptr startup ); diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp index d10805a78..3d28a723d 100644 --- a/kicker/extensions/kasbar/kastasker.cpp +++ b/kicker/extensions/kasbar/kastasker.cpp @@ -102,17 +102,17 @@ KasTasker::KasTasker( Orientation o, TQWidget* parent, const char* name, WFlags loadItem(0) { setAcceptDrops( true ); - connect(TaskManager::the(), TQT_SIGNAL(taskAdded(Task::Ptr)), TQT_SLOT(addTask(Task::Ptr))); - connect(TaskManager::the(), TQT_SIGNAL(taskRemoved(Task::Ptr)), TQT_SLOT(removeTask(Task::Ptr))); - connect(TaskManager::the(), TQT_SIGNAL(startupAdded(Startup::Ptr)), TQT_SLOT(addStartup(Startup::Ptr))); - connect(TaskManager::the(), TQT_SIGNAL(startupRemoved(Startup::Ptr)), TQT_SLOT(removeStartup(Startup::Ptr))); - connect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), TQT_SLOT(refreshAllLater())); -// connect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), TQT_SLOT( refreshAllLater() ) ); + connect(TaskManager::the(), TQ_SIGNAL(taskAdded(Task::Ptr)), TQ_SLOT(addTask(Task::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(taskRemoved(Task::Ptr)), TQ_SLOT(removeTask(Task::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(startupAdded(Startup::Ptr)), TQ_SLOT(addStartup(Startup::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(startupRemoved(Startup::Ptr)), TQ_SLOT(removeStartup(Startup::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(desktopChanged(int)), TQ_SLOT(refreshAllLater())); +// connect( manager, TQ_SIGNAL( windowChanged( Task::Ptr ) ), TQ_SLOT( refreshAllLater() ) ); - connect( this, TQT_SIGNAL( itemSizeChanged( int ) ), TQT_SLOT( refreshAll() ) ); + connect( this, TQ_SIGNAL( itemSizeChanged( int ) ), TQ_SLOT( refreshAll() ) ); - connect( this, TQT_SIGNAL( detachedPositionChanged(const TQPoint &) ), TQT_SLOT( writeLayout() ) ); - connect( this, TQT_SIGNAL( directionChanged() ), TQT_SLOT( writeLayout() ) ); + connect( this, TQ_SIGNAL( detachedPositionChanged(const TQPoint &) ), TQ_SLOT( writeLayout() ) ); + connect( this, TQ_SIGNAL( directionChanged() ), TQ_SLOT( writeLayout() ) ); } KasTasker::KasTasker( Orientation o, KasTasker *master, TQWidget* parent, const char* name, WFlags f ) @@ -152,62 +152,62 @@ TDEPopupMenu *KasTasker::contextMenu() menu = new TDEPopupMenu; showAllWindowsAction = new TDEToggleAction( i18n("Show &All Windows"), TDEShortcut(), - TQT_TQOBJECT(this), "toggle_show_all_windows" ); + this, "toggle_show_all_windows" ); showAllWindowsAction->setChecked( showAllWindows() ); showAllWindowsAction->plug( menu ); - connect( showAllWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowAllWindows(bool)) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQT_SLOT(setChecked(bool)) ); + connect( showAllWindowsAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setShowAllWindows(bool)) ); + connect( this, TQ_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQ_SLOT(setChecked(bool)) ); groupWindowsAction = new TDEToggleAction( i18n("&Group Windows"), TDEShortcut(), - TQT_TQOBJECT(this), "toggle_group_windows" ); + this, "toggle_group_windows" ); groupWindowsAction->setChecked( groupWindows() ); groupWindowsAction->plug( menu ); - connect( groupWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setGroupWindows(bool)) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQT_SLOT(setChecked(bool)) ); + connect( groupWindowsAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setGroupWindows(bool)) ); + connect( this, TQ_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQ_SLOT(setChecked(bool)) ); - showClockAction = new TDEToggleAction( i18n("Show &Clock"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_show_clock" ); + showClockAction = new TDEToggleAction( i18n("Show &Clock"), TDEShortcut(), this, "toggle_show_clock" ); showClockAction->setChecked( showClock() ); showClockAction->plug( menu ); - connect( showClockAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowClock(bool)) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL(showClockChanged(bool)), showClockAction, TQT_SLOT(setChecked(bool)) ); + connect( showClockAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setShowClock(bool)) ); + connect( this, TQ_SIGNAL(showClockChanged(bool)), showClockAction, TQ_SLOT(setChecked(bool)) ); - showLoadAction = new TDEToggleAction( i18n("Show &Load Meter"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_show_load" ); + showLoadAction = new TDEToggleAction( i18n("Show &Load Meter"), TDEShortcut(), this, "toggle_show_load" ); showLoadAction->setChecked( showLoad() ); showLoadAction->plug( menu ); - connect( showLoadAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowLoad(bool)) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL(showLoadChanged(bool)), showLoadAction, TQT_SLOT(setChecked(bool)) ); + connect( showLoadAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setShowLoad(bool)) ); + connect( this, TQ_SIGNAL(showLoadChanged(bool)), showLoadAction, TQ_SLOT(setChecked(bool)) ); menu->insertSeparator(); if ( !standalone_ ) { - toggleDetachedAction = new TDEToggleAction( i18n("&Floating"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_detached" ); + toggleDetachedAction = new TDEToggleAction( i18n("&Floating"), TDEShortcut(), this, "toggle_detached" ); toggleDetachedAction->setChecked( isDetached() ); toggleDetachedAction->plug( menu ); - connect( toggleDetachedAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setDetached(bool)) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQT_SLOT(setChecked(bool)) ); + connect( toggleDetachedAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setDetached(bool)) ); + connect( this, TQ_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQ_SLOT(setChecked(bool)) ); } rotateBarAction = new TDEAction( i18n("R&otate Bar"), TQString("rotate"), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT( toggleOrientation() ), - TQT_TQOBJECT(this), "rotate_bar" ); + this, TQ_SLOT( toggleOrientation() ), + this, "rotate_bar" ); rotateBarAction->plug( menu ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL(detachedChanged(bool)), rotateBarAction, TQT_SLOT(setEnabled(bool)) ); - connect( rotateBarAction, TQT_SIGNAL(activated()), TQT_SLOT(writeConfigLater()) ); + connect( this, TQ_SIGNAL(detachedChanged(bool)), rotateBarAction, TQ_SLOT(setEnabled(bool)) ); + connect( rotateBarAction, TQ_SIGNAL(activated()), TQ_SLOT(writeConfigLater()) ); - menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), TQT_TQOBJECT(this), TQT_SLOT( refreshAll() ) ); + menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), this, TQ_SLOT( refreshAll() ) ); menu->insertSeparator(); - menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), TQT_TQOBJECT(this), TQT_SLOT( showPreferences() ) ); + menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), this, TQ_SLOT( showPreferences() ) ); // Help menu TDEPopupMenu *help = new TDEPopupMenu; - help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), TQT_TQOBJECT(this), TQT_SLOT( showAbout() ) ); + help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), this, TQ_SLOT( showAbout() ) ); menu->insertItem( SmallIcon("help"), i18n("&Help"), help ); if ( standalone_ ) { menu->insertSeparator(); - menu->insertItem( SmallIcon("system-log-out"), i18n("&Quit"), tqApp, TQT_SLOT( quit() ) ); + menu->insertItem( SmallIcon("system-log-out"), i18n("&Quit"), tqApp, TQ_SLOT( quit() ) ); } } @@ -294,7 +294,7 @@ KasGroupItem *KasTasker::convertToGroup( Task::Ptr t ) removeTask( t ); insert( i, gi ); - connect(TaskManager::the(), TQT_SIGNAL(taskRemoved(Task::Ptr)), gi, TQT_SLOT(removeTask(Task::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(taskRemoved(Task::Ptr)), gi, TQ_SLOT(removeTask(Task::Ptr))); return gi; } @@ -371,7 +371,7 @@ void KasTasker::refreshAll() void KasTasker::refreshAllLater() { - TQTimer::singleShot( SWITCH_DESKTOPS_REGROUP_DELAY, this, TQT_SLOT( refreshAll() ) ); + TQTimer::singleShot( SWITCH_DESKTOPS_REGROUP_DELAY, this, TQ_SLOT( refreshAll() ) ); } void KasTasker::refreshIconGeometry() @@ -432,12 +432,12 @@ void KasTasker::setShowAllWindows( bool enable ) showAllWindows_ = enable; refreshAll(); if ( !showAllWindows_ ) { - connect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), TQT_SLOT(refreshAll())); -// connect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), TQT_SLOT( refreshAll() ) ); + connect(TaskManager::the(), TQ_SIGNAL(desktopChanged(int)), TQ_SLOT(refreshAll())); +// connect( manager, TQ_SIGNAL( windowChanged( Task::Ptr ) ), TQ_SLOT( refreshAll() ) ); } else { - disconnect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), this, TQT_SLOT(refreshAll())); -// disconnect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), this, TQT_SLOT( refreshAll() ) ); + disconnect(TaskManager::the(), TQ_SIGNAL(desktopChanged(int)), this, TQ_SLOT(refreshAll())); +// disconnect( manager, TQ_SIGNAL( windowChanged( Task::Ptr ) ), this, TQ_SLOT( refreshAll() ) ); } emit showAllWindowsChanged( enable ); @@ -551,7 +551,7 @@ void KasTasker::readConfig() void KasTasker::writeConfigLater() { - TQTimer::singleShot( 10, this, TQT_SLOT( writeConfig() ) ); + TQTimer::singleShot( 10, this, TQ_SLOT( writeConfig() ) ); } void KasTasker::writeConfig() @@ -635,7 +635,7 @@ void KasTasker::readConfig( TDEConfig *conf ) conf->setGroup("Layout"); setDirection( (Direction) conf->readNumEntry( "Direction", TQBoxLayout::LeftToRight ) ); - setOrientation( (Qt::Orientation) conf->readNumEntry( "Orientation", Qt::Horizontal ) ); + setOrientation( (TQt::Orientation) conf->readNumEntry( "Orientation", TQt::Horizontal ) ); setMaxBoxes( conf->readUnsignedNumEntry( "MaxBoxes", 0 ) ); TQPoint pos(100, 100); diff --git a/kicker/extensions/kasbar/kastasker.h b/kicker/extensions/kasbar/kastasker.h index c56015aad..c05c13bb6 100644 --- a/kicker/extensions/kasbar/kastasker.h +++ b/kicker/extensions/kasbar/kastasker.h @@ -82,21 +82,21 @@ class KasGrouper; */ class KDE_EXPORT KasTasker : public KasBar { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool isTopLevel READ isTopLevel ) TQ_PROPERTY( bool showClock READ showClock ) TQ_PROPERTY( bool showLoad READ showLoad ) public: /** Create a KasTasker widget. */ - KasTasker( Qt::Orientation o, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 ); + KasTasker( TQt::Orientation o, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 ); /** * Create a KasTasker widget that is slaved to another KasTasker. The * created widget will inherit the settings of the parent, but will * not connect to the signals of the TaskManager. */ - KasTasker( Qt::Orientation o, KasTasker *master, + KasTasker( TQt::Orientation o, KasTasker *master, TQWidget *parent=0, const char *name=0, WFlags f=0 ); /** Cleans up. */ @@ -105,7 +105,7 @@ public: /** Factory method that returns the default menu for items in the bar. */ virtual TDEPopupMenu *contextMenu(); - virtual KasTasker *createChildBar( Qt::Orientation o, TQWidget *parent, const char *name=0 ); + virtual KasTasker *createChildBar( TQt::Orientation o, TQWidget *parent, const char *name=0 ); /** * Returns true if this is the top KasTasker. Note that it is possible for diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp index 0f57524cc..b7ab94de6 100644 --- a/kicker/extensions/kasbar/kastaskitem.cpp +++ b/kicker/extensions/kasbar/kastaskitem.cpp @@ -99,17 +99,17 @@ KasTaskItem::KasTaskItem( KasTasker *parent, Task::Ptr task ) setAttention( task->demandsAttention() ); updateTask(false); - connect( task, TQT_SIGNAL( changed(bool) ), this, TQT_SLOT( updateTask(bool) ) ); - connect( task, TQT_SIGNAL( activated() ), this, TQT_SLOT( startAutoThumbnail() ) ); - connect( task, TQT_SIGNAL( deactivated() ), this, TQT_SLOT( stopAutoThumbnail() ) ); - connect( task, TQT_SIGNAL( iconChanged() ), this, TQT_SLOT( iconChanged() ) ); - connect( task, TQT_SIGNAL( thumbnailChanged() ), this, TQT_SLOT( iconChanged() ) ); + connect( task, TQ_SIGNAL( changed(bool) ), this, TQ_SLOT( updateTask(bool) ) ); + connect( task, TQ_SIGNAL( activated() ), this, TQ_SLOT( startAutoThumbnail() ) ); + connect( task, TQ_SIGNAL( deactivated() ), this, TQ_SLOT( stopAutoThumbnail() ) ); + connect( task, TQ_SIGNAL( iconChanged() ), this, TQ_SLOT( iconChanged() ) ); + connect( task, TQ_SIGNAL( thumbnailChanged() ), this, TQ_SLOT( iconChanged() ) ); - connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(toggleActivateAction()) ); - connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showWindowMenuAt(TQMouseEvent *) ) ); + connect( this, TQ_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQ_SLOT(toggleActivateAction()) ); + connect( this, TQ_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQ_SLOT(showWindowMenuAt(TQMouseEvent *) ) ); attentionTimer = new TQTimer( this, "attentionTimer" ); - connect( attentionTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkAttention() ) ); + connect( attentionTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkAttention() ) ); attentionTimer->start( CHECK_ATTENTION_DELAY ); } @@ -295,12 +295,12 @@ void KasTaskItem::startAutoThumbnail() if ( kasbar()->thumbnailUpdateDelay() > 0 ) { thumbTimer = new TQTimer( this, "thumbTimer" ); - connect( thumbTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( refreshThumbnail() ) ); + connect( thumbTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( refreshThumbnail() ) ); thumbTimer->start( kasbar()->thumbnailUpdateDelay() * 1000 ); } - TQTimer::singleShot( 200, this, TQT_SLOT( refreshThumbnail() ) ); + TQTimer::singleShot( 200, this, TQ_SLOT( refreshThumbnail() ) ); } void KasTaskItem::stopAutoThumbnail() @@ -322,7 +322,7 @@ void KasTaskItem::refreshThumbnail() // TODO: Check if the popup obscures the window KasItem *i = kasbar()->itemUnderMouse(); if ( i && i->isShowingPopup() ) { - TQTimer::singleShot( 200, this, TQT_SLOT( refreshThumbnail() ) ); + TQTimer::singleShot( 200, this, TQ_SLOT( refreshThumbnail() ) ); return; } @@ -333,11 +333,11 @@ void KasTaskItem::refreshThumbnail() void KasTaskItem::showWindowMenuAt( TQPoint p ) { TaskRMBMenu *tm = new TaskRMBMenu(task_, true, kasbar()); - tm->insertItem( i18n("To &Tray" ), this, TQT_SLOT( sendToTray() ) ); + tm->insertItem( i18n("To &Tray" ), this, TQ_SLOT( sendToTray() ) ); tm->insertSeparator(); tm->insertItem( i18n("&Kasbar"), kasbar()->contextMenu() ); tm->insertSeparator(); - tm->insertItem( i18n("&Properties" ), this, TQT_SLOT( showPropertiesDialog() ) ); + tm->insertItem( i18n("&Properties" ), this, TQ_SLOT( showPropertiesDialog() ) ); mouseLeave(); kasbar()->updateMouseOver(); @@ -390,7 +390,7 @@ void KasTaskItem::showPropertiesDialog() tabs->addTab( createTaskProps( task_, tabs ), i18n("Task") ); tabs->addTab( createTaskProps( this, tabs ), i18n("Item") ); - tabs->addTab( createTaskProps( TQT_TQOBJECT(kasbar()), tabs, false ), i18n("Bar") ); + tabs->addTab( createTaskProps( kasbar(), tabs, false ), i18n("Bar") ); #if 0 tabs->addTab( createNETProps( tabs ), i18n("NET") ); diff --git a/kicker/extensions/kasbar/kastaskitem.h b/kicker/extensions/kasbar/kastaskitem.h index 7c18685dd..99205ae27 100644 --- a/kicker/extensions/kasbar/kastaskitem.h +++ b/kicker/extensions/kasbar/kastaskitem.h @@ -67,7 +67,7 @@ class KPixmap; */ class KasTaskItem : public KasItem { - Q_OBJECT + TQ_OBJECT public: KasTaskItem( KasTasker *parent, Task::Ptr task ); diff --git a/kicker/extensions/kasbar/kastaskpopup.cpp b/kicker/extensions/kasbar/kastaskpopup.cpp index 7b5fe4ed5..8905af37a 100644 --- a/kicker/extensions/kasbar/kastaskpopup.cpp +++ b/kicker/extensions/kasbar/kastaskpopup.cpp @@ -91,10 +91,10 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name ) } KPixmapEffect::gradient( titleBg, - Qt::black, colorGroup().mid(), + TQt::black, colorGroup().mid(), KPixmapEffect::DiagonalGradient ); - connect( item->task(), TQT_SIGNAL( thumbnailChanged() ), TQT_SLOT( refresh() ) ); + connect( item->task(), TQ_SIGNAL( thumbnailChanged() ), TQ_SLOT( refresh() ) ); } KasTaskPopup::~KasTaskPopup() @@ -119,7 +119,7 @@ void KasTaskPopup::paintEvent( TQPaintEvent * ) TQString text = item->task()->visibleIconicName(); - p.setPen( Qt::white ); + p.setPen( TQt::white ); if ( fontMetrics().width( text ) > width() - 4 ) p.drawText( 1, 1, width() - 4, TITLE_HEIGHT - 1, AlignLeft | AlignVCenter, text ); @@ -133,7 +133,7 @@ void KasTaskPopup::paintEvent( TQPaintEvent * ) // // Draw border // - p.setPen( Qt::black ); + p.setPen( TQt::black ); p.drawRect( 0, 0, width(), height() ); } diff --git a/kicker/extensions/kasbar/kastaskpopup.h b/kicker/extensions/kasbar/kastaskpopup.h index 00b390dec..c209f8774 100644 --- a/kicker/extensions/kasbar/kastaskpopup.h +++ b/kicker/extensions/kasbar/kastaskpopup.h @@ -66,7 +66,7 @@ class KasTaskItem; */ class KasTaskPopup : public KasPopup { - Q_OBJECT + TQ_OBJECT public: KasTaskPopup( KasTaskItem *item, const char *name=0 ); diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp index 1a4f6924b..142b42ee3 100644 --- a/kicker/extensions/sidebar/sidebarextension.cpp +++ b/kicker/extensions/sidebar/sidebarextension.cpp @@ -57,15 +57,15 @@ SidebarExtension::SidebarExtension( const TQString& configFile, "konq_sidebar", m_sbWrapper, "SideBar_View", - TQT_TQOBJECT(this), + this, "Sidebar","universal"); KParts::BrowserExtension *be=KParts::BrowserExtension::childObject(p); if (be) { - connect(be,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)), - this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); - connect(be,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), - this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); + connect(be,TQ_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)), + this,TQ_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); + connect(be,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), + this,TQ_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); } @@ -73,8 +73,8 @@ SidebarExtension::SidebarExtension( const TQString& configFile, m_resizeHandle->setFrameShape(TQFrame::Panel); m_resizeHandle->setFrameShadow(TQFrame::Raised); m_resizeHandle->setFixedWidth(6); - m_resizeHandle->setCursor(TQCursor(Qt::SizeHorCursor)); - connect(p->widget(),TQT_SIGNAL(panelHasBeenExpanded(bool)),this,TQT_SLOT(needLayoutUpdate(bool))); + m_resizeHandle->setCursor(TQCursor(TQt::SizeHorCursor)); + connect(p->widget(),TQ_SIGNAL(panelHasBeenExpanded(bool)),this,TQ_SLOT(needLayoutUpdate(bool))); needLayoutUpdate(false); m_resizeHandle->installEventFilter(this); m_resizeHandle->setMouseTracking(true); diff --git a/kicker/extensions/sidebar/sidebarextension.h b/kicker/extensions/sidebar/sidebarextension.h index 5a117b1ee..bd8210a3c 100644 --- a/kicker/extensions/sidebar/sidebarextension.h +++ b/kicker/extensions/sidebar/sidebarextension.h @@ -26,7 +26,7 @@ class TQVBox; class SidebarExtension : public KPanelExtension { - Q_OBJECT + TQ_OBJECT public: SidebarExtension( const TQString& configFile, diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp index 4606b27fb..56f33c66d 100644 --- a/kicker/extensions/taskbar/taskbarextension.cpp +++ b/kicker/extensions/taskbar/taskbarextension.cpp @@ -63,17 +63,17 @@ TaskBarExtension::TaskBarExtension(const TQString& configFile, Type type, positionChange(position()); layout->addWidget(m_container); - connect(m_container, TQT_SIGNAL(containerCountChanged()), - TQT_SIGNAL(updateLayout())); + connect(m_container, TQ_SIGNAL(containerCountChanged()), + TQ_SIGNAL(updateLayout())); kapp->dcopClient()->setNotifications(true); connectDCOPSignal("kicker", "kicker", "configurationChanged()", "configure()", false); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), - TQT_SLOT(setBackgroundTheme())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), + TQ_SLOT(setBackgroundTheme())); - TQTimer::singleShot(0, this, TQT_SLOT(setBackgroundTheme())); + TQTimer::singleShot(0, this, TQ_SLOT(setBackgroundTheme())); } TaskBarExtension::~TaskBarExtension() @@ -101,7 +101,7 @@ void TaskBarExtension::positionChange( Position p ) m_container->popupDirectionChange(KPanelApplet::Right); break; case Floating: - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { m_container->popupDirectionChange(KPanelApplet::Down); } @@ -150,8 +150,8 @@ void TaskBarExtension::setBackgroundTheme() { m_rootPixmap = new KRootPixmap(this); m_rootPixmap->setCustomPainting(true); - connect(m_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap&)), - TQT_SLOT(updateBackground(const TQPixmap&))); + connect(m_rootPixmap, TQ_SIGNAL(backgroundUpdated(const TQPixmap&)), + TQ_SLOT(updateBackground(const TQPixmap&))); } else { @@ -185,7 +185,7 @@ void TaskBarExtension::setBackgroundTheme() { TQImage bgImage = m_bgImage; - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { if (KickerSettings::rotateBackground()) { diff --git a/kicker/extensions/taskbar/taskbarextension.h b/kicker/extensions/taskbar/taskbarextension.h index 2848e80c7..f2bc3ebf0 100644 --- a/kicker/extensions/taskbar/taskbarextension.h +++ b/kicker/extensions/taskbar/taskbarextension.h @@ -34,7 +34,7 @@ class TaskBarContainer; class TaskBarExtension : public KPanelExtension, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP k_dcop: diff --git a/kicker/kicker/buttons/bookmarksbutton.h b/kicker/kicker/buttons/bookmarksbutton.h index bb6d450e1..18d03214c 100644 --- a/kicker/kicker/buttons/bookmarksbutton.h +++ b/kicker/kicker/buttons/bookmarksbutton.h @@ -36,7 +36,7 @@ class KBookmarkOwner; */ class BookmarksButton : public PanelPopupButton { - Q_OBJECT + TQ_OBJECT public: BookmarksButton(TQWidget* parent); diff --git a/kicker/kicker/buttons/browserbutton.cpp b/kicker/kicker/buttons/browserbutton.cpp index 71f2d0504..7ab5de6de 100644 --- a/kicker/kicker/buttons/browserbutton.cpp +++ b/kicker/kicker/buttons/browserbutton.cpp @@ -66,7 +66,7 @@ void BrowserButton::initialize( const TQString& icon, const TQString& path ) setPopup(topMenu); _menuTimer = new TQTimer( this, "_menuTimer" ); - connect( _menuTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotDelayedPopup()) ); + connect( _menuTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotDelayedPopup()) ); TQToolTip::add(this, i18n("Browse: %1").arg(path)); setTitle( path ); diff --git a/kicker/kicker/buttons/browserbutton.h b/kicker/kicker/buttons/browserbutton.h index 507a764ed..627368472 100644 --- a/kicker/kicker/buttons/browserbutton.h +++ b/kicker/kicker/buttons/browserbutton.h @@ -33,7 +33,7 @@ class PanelBrowserMenu; */ class BrowserButton : public PanelPopupButton { - Q_OBJECT + TQ_OBJECT public: BrowserButton( const TQString& icon, const TQString& startDir, TQWidget* parent ); diff --git a/kicker/kicker/buttons/desktopbutton.cpp b/kicker/kicker/buttons/desktopbutton.cpp index fe70954f9..b548579f6 100644 --- a/kicker/kicker/buttons/desktopbutton.cpp +++ b/kicker/kicker/buttons/desktopbutton.cpp @@ -45,8 +45,8 @@ DesktopButton::DesktopButton( TQWidget* parent ) setTitle(i18n("Desktop Access")); setIcon("desktop"); - connect( this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showDesktop(bool)) ); - connect( ShowDesktop::the(), TQT_SIGNAL(desktopShown(bool)), this, TQT_SLOT(toggle(bool)) ); + connect( this, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(showDesktop(bool)) ); + connect( ShowDesktop::the(), TQ_SIGNAL(desktopShown(bool)), this, TQ_SLOT(toggle(bool)) ); setOn( ShowDesktop::the()->desktopShowing() ); } diff --git a/kicker/kicker/buttons/desktopbutton.h b/kicker/kicker/buttons/desktopbutton.h index c896bdf92..3ea98a49e 100644 --- a/kicker/kicker/buttons/desktopbutton.h +++ b/kicker/kicker/buttons/desktopbutton.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ class DesktopButton : public PanelButton { - Q_OBJECT + TQ_OBJECT public: DesktopButton( TQWidget* parent ); diff --git a/kicker/kicker/buttons/extensionbutton.h b/kicker/kicker/buttons/extensionbutton.h index 2d2d2d1f2..3c9932655 100644 --- a/kicker/kicker/buttons/extensionbutton.h +++ b/kicker/kicker/buttons/extensionbutton.h @@ -31,7 +31,7 @@ class KPanelMenu; class ExtensionButton : public PanelPopupButton { - Q_OBJECT + TQ_OBJECT public: ExtensionButton( const TQString& desktopFile, TQWidget* parent ); diff --git a/kicker/kicker/buttons/kbutton.h b/kicker/kicker/buttons/kbutton.h index 896bf56c2..fd34e5104 100644 --- a/kicker/kicker/buttons/kbutton.h +++ b/kicker/kicker/buttons/kbutton.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ class KButton : public PanelPopupButton { - Q_OBJECT + TQ_OBJECT public: KButton( TQWidget *parent ); diff --git a/kicker/kicker/buttons/knewbutton.cpp b/kicker/kicker/buttons/knewbutton.cpp index ee5fa9c1f..ee3a942e5 100644 --- a/kicker/kicker/buttons/knewbutton.cpp +++ b/kicker/kicker/buttons/knewbutton.cpp @@ -100,7 +100,7 @@ void KNewButton::show() KButton::show(); if (KickerSettings::firstRun()) { - TQTimer::singleShot(0,this,TQT_SLOT(slotExecMenu())); + TQTimer::singleShot(0,this,TQ_SLOT(slotExecMenu())); KickerSettings::setFirstRun(false); KickerSettings::writeConfig(); } @@ -112,11 +112,11 @@ bool KNewButton::eventFilter(TQObject *o, TQEvent *e) e->type() == TQEvent::MouseButtonPress || e->type() == TQEvent::MouseButtonDblClick ) { - TQMouseEvent *me = TQT_TQMOUSEEVENT(e); - if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos()))) + TQMouseEvent *me = static_cast<TQMouseEvent*>(e); + if (rect().contains(mapFromGlobal(me->globalPos()))) { if (m_pressedDuringPopup && m_popup && m_openTimer != -1 - && (me->button() & Qt::LeftButton) ) + && (me->button() & TQt::LeftButton) ) return true; } } diff --git a/kicker/kicker/buttons/knewbutton.h b/kicker/kicker/buttons/knewbutton.h index 1bdbbafbd..d38df07c6 100644 --- a/kicker/kicker/buttons/knewbutton.h +++ b/kicker/kicker/buttons/knewbutton.h @@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ class KNewButton : public KButton { - Q_OBJECT + TQ_OBJECT public: KNewButton( TQWidget *parent ); diff --git a/kicker/kicker/buttons/nontdeappbutton.cpp b/kicker/kicker/buttons/nontdeappbutton.cpp index 4f88f2d37..972944897 100644 --- a/kicker/kicker/buttons/nontdeappbutton.cpp +++ b/kicker/kicker/buttons/nontdeappbutton.cpp @@ -61,7 +61,7 @@ NonKDEAppButton::NonKDEAppButton(const TQString& name, // to the slotExec() slot // we do this here instead of in initialize(...) since initialize(...) may // get called later, e.g after reconfiguring it - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec())); } // this constructor is used when restoring a button, usually at startup @@ -77,7 +77,7 @@ NonKDEAppButton::NonKDEAppButton( const TDEConfigGroup& config, TQWidget* parent config.readBoolEntry("RunInTerminal")); // see comment on connect in above constructor - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec())); } void NonKDEAppButton::initialize(const TQString& name, @@ -278,8 +278,8 @@ void NonKDEAppButton::properties() // ... connect the signal it emits when it has data for us to save // to our updateSettings slot (see above) ... - connect(dlg, TQT_SIGNAL(updateSettings(PanelExeDialog*)), this, - TQT_SLOT(updateSettings(PanelExeDialog*))); + connect(dlg, TQ_SIGNAL(updateSettings(PanelExeDialog*)), this, + TQ_SLOT(updateSettings(PanelExeDialog*))); // ... and then show it to the user dlg->show(); diff --git a/kicker/kicker/buttons/nontdeappbutton.h b/kicker/kicker/buttons/nontdeappbutton.h index 94c7cb59d..eac6ce412 100644 --- a/kicker/kicker/buttons/nontdeappbutton.h +++ b/kicker/kicker/buttons/nontdeappbutton.h @@ -37,8 +37,8 @@ class PanelExeDialog; */ class NonKDEAppButton : public PanelButton { - // the Q_OBJECT macro provides the magic glue for signals 'n slots - Q_OBJECT + // the TQ_OBJECT macro provides the magic glue for signals 'n slots + TQ_OBJECT public: // define our two constructors, one used for creating new buttons... diff --git a/kicker/kicker/buttons/servicebutton.cpp b/kicker/kicker/buttons/servicebutton.cpp index 716a750ed..9b368407e 100644 --- a/kicker/kicker/buttons/servicebutton.cpp +++ b/kicker/kicker/buttons/servicebutton.cpp @@ -121,7 +121,7 @@ void ServiceButton::loadServiceFromId(const TQString &id) void ServiceButton::initialize() { readDesktopFile(); - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec())); } void ServiceButton::readDesktopFile() @@ -192,7 +192,7 @@ void ServiceButton::slotExec() { // this allows the button to return to a non-pressed state // before launching - TQTimer::singleShot(0, this, TQT_SLOT(performExec())); + TQTimer::singleShot(0, this, TQ_SLOT(performExec())); } void ServiceButton::performExec() @@ -223,10 +223,10 @@ void ServiceButton::properties() KPropertiesDialog* dialog = new KPropertiesDialog(serviceURL, 0, 0, false, false); dialog->setFileNameReadOnly(true); - connect(dialog, TQT_SIGNAL(saveAs(const KURL &, KURL &)), - this, TQT_SLOT(slotSaveAs(const KURL &, KURL &))); - connect(dialog, TQT_SIGNAL(propertiesClosed()), - this, TQT_SLOT(slotUpdate())); + connect(dialog, TQ_SIGNAL(saveAs(const KURL &, KURL &)), + this, TQ_SLOT(slotSaveAs(const KURL &, KURL &))); + connect(dialog, TQ_SIGNAL(propertiesClosed()), + this, TQ_SLOT(slotUpdate())); dialog->show(); } diff --git a/kicker/kicker/buttons/servicebutton.h b/kicker/kicker/buttons/servicebutton.h index ac551adb5..a2d7939e8 100644 --- a/kicker/kicker/buttons/servicebutton.h +++ b/kicker/kicker/buttons/servicebutton.h @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class ServiceButton : public PanelButton { - Q_OBJECT + TQ_OBJECT public: ServiceButton( const TQString& desktopFile, TQWidget* parent ); diff --git a/kicker/kicker/buttons/servicemenubutton.h b/kicker/kicker/buttons/servicemenubutton.h index da512105d..bef038859 100644 --- a/kicker/kicker/buttons/servicemenubutton.h +++ b/kicker/kicker/buttons/servicemenubutton.h @@ -33,7 +33,7 @@ class PanelServiceMenu; */ class ServiceMenuButton : public PanelPopupButton { - Q_OBJECT + TQ_OBJECT public: ServiceMenuButton( const TQString& relPath, TQWidget* parent ); diff --git a/kicker/kicker/buttons/urlbutton.cpp b/kicker/kicker/buttons/urlbutton.cpp index 13ff95323..d398b07b0 100644 --- a/kicker/kicker/buttons/urlbutton.cpp +++ b/kicker/kicker/buttons/urlbutton.cpp @@ -90,7 +90,7 @@ void URLButton::initialize( const TQString& _url ) } fileItem = new KFileItem( KFileItem::Unknown, KFileItem::Unknown, url ); setIcon( fileItem->iconName() ); - connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec()) ); + connect( this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec()) ); setToolTip(); if (url.isLocalFile()) @@ -196,6 +196,6 @@ void URLButton::properties() pDlg = new KPropertiesDialog(fileItem, 0L, 0L, false, false); // will delete itself pDlg->setFileNameReadOnly(true); - connect(pDlg, TQT_SIGNAL(applied()), TQT_SLOT(updateURL())); + connect(pDlg, TQ_SIGNAL(applied()), TQ_SLOT(updateURL())); pDlg->show(); } diff --git a/kicker/kicker/buttons/urlbutton.h b/kicker/kicker/buttons/urlbutton.h index ba4a1b43d..dd55d78b4 100644 --- a/kicker/kicker/buttons/urlbutton.h +++ b/kicker/kicker/buttons/urlbutton.h @@ -34,7 +34,7 @@ class KPropertiesDialog; */ class URLButton : public PanelButton { - Q_OBJECT + TQ_OBJECT public: URLButton( const TQString& url, TQWidget* parent ); diff --git a/kicker/kicker/buttons/windowlist.desktop b/kicker/kicker/buttons/windowlist.desktop index 94c035def..1ffb96610 100644 --- a/kicker/kicker/buttons/windowlist.desktop +++ b/kicker/kicker/buttons/windowlist.desktop @@ -3,5 +3,5 @@ Name=Window List Menu Comment=A menu that lists all open windows -Icon=window_list +Icon=window_duplicate X-TDE-Library=WindowListButton diff --git a/kicker/kicker/buttons/windowlistbutton.cpp b/kicker/kicker/buttons/windowlistbutton.cpp index f1c72904e..cbcfd4b75 100644 --- a/kicker/kicker/buttons/windowlistbutton.cpp +++ b/kicker/kicker/buttons/windowlistbutton.cpp @@ -38,7 +38,7 @@ WindowListButton::WindowListButton( TQWidget* parent ) setTitle(i18n("Window List")); TQToolTip::add(this, i18n("Window list")); - setIcon("window_list"); + setIcon("window_duplicate"); } void WindowListButton::initPopup() diff --git a/kicker/kicker/buttons/windowlistbutton.h b/kicker/kicker/buttons/windowlistbutton.h index d8b57c62e..d9b67fb67 100644 --- a/kicker/kicker/buttons/windowlistbutton.h +++ b/kicker/kicker/buttons/windowlistbutton.h @@ -33,7 +33,7 @@ class KWindowListMenu; */ class WindowListButton : public PanelPopupButton { - Q_OBJECT + TQ_OBJECT public: WindowListButton( TQWidget* parent ); diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp index 1806fedbb..c8f87b02e 100644 --- a/kicker/kicker/core/applethandle.cpp +++ b/kicker/kicker/core/applethandle.cpp @@ -64,8 +64,8 @@ AppletHandle::AppletHandle(AppletContainer* parent) m_menuButton->installEventFilter(this); m_layout->addWidget(m_menuButton); - connect(m_menuButton, TQT_SIGNAL(pressed()), - this, TQT_SLOT(menuButtonPressed())); + connect(m_menuButton, TQ_SIGNAL(pressed()), + this, TQ_SLOT(menuButtonPressed())); TQToolTip::add(m_menuButton, i18n("%1 menu").arg(parent->info().name())); } @@ -89,7 +89,7 @@ int AppletHandle::widthForHeight( int /* h */ ) const void AppletHandle::setPopupDirection(KPanelApplet::Direction d) { - Qt::ArrowType a = Qt::UpArrow; + TQt::ArrowType a = TQt::UpArrow; if (d == m_popupDirection || !m_menuButton) { @@ -102,19 +102,19 @@ void AppletHandle::setPopupDirection(KPanelApplet::Direction d) { case KPanelApplet::Up: m_layout->setDirection(TQBoxLayout::BottomToTop); - a = Qt::UpArrow; + a = TQt::UpArrow; break; case KPanelApplet::Down: m_layout->setDirection(TQBoxLayout::TopToBottom); - a = Qt::DownArrow; + a = TQt::DownArrow; break; case KPanelApplet::Left: m_layout->setDirection(TQBoxLayout::RightToLeft); - a = Qt::LeftArrow; + a = TQt::LeftArrow; break; case KPanelApplet::Right: m_layout->setDirection(TQBoxLayout::LeftToRight); - a = Qt::RightArrow; + a = TQt::RightArrow; break; } @@ -151,8 +151,8 @@ void AppletHandle::setFadeOutHandle(bool fadeOut) if (!m_handleHoverTimer) { m_handleHoverTimer = new TQTimer(this, "m_handleHoverTimer"); - connect(m_handleHoverTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(checkHandleHover())); + connect(m_handleHoverTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(checkHandleHover())); m_applet->installEventFilter(this); } } @@ -200,7 +200,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) // a hack for applets that have out-of-process // elements (e.g the systray) so that the handle // doesn't flicker when moving over those elements - if (TQT_TQRECT_OBJECT(w->rect()).contains(w->mapFromGlobal(TQCursor::pos()))) + if (w->rect().contains(w->mapFromGlobal(TQCursor::pos()))) { nowDrawIt = true; } @@ -220,12 +220,12 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) return TQWidget::eventFilter( o, e ); } - else if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_dragBar)) + else if (o == m_dragBar) { if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* ev = TQT_TQMOUSEEVENT(e); - if (ev->button() == Qt::LeftButton || ev->button() == Qt::MidButton) + TQMouseEvent* ev = static_cast<TQMouseEvent*>(e); + if (ev->button() == TQt::LeftButton || ev->button() == TQt::MidButton) { emit moveApplet(m_applet->mapFromGlobal(ev->globalPos())); } @@ -234,8 +234,8 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) if (m_menuButton && e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* ev = TQT_TQMOUSEEVENT(e); - if (ev->button() == Qt::RightButton) + TQMouseEvent* ev = static_cast<TQMouseEvent*>(e); + if (ev->button() == TQt::RightButton) { if (!m_menuButton->isDown()) { @@ -312,7 +312,7 @@ TQSize AppletHandleDrag::minimumSizeHint() const { int wh = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); - if (m_parent->orientation() == Qt::Horizontal) + if (m_parent->orientation() == TQt::Horizontal) { return TQSize(wh, 0); } @@ -322,7 +322,7 @@ TQSize AppletHandleDrag::minimumSizeHint() const TQSizePolicy AppletHandleDrag::sizePolicy() const { - if (m_parent->orientation() == Qt::Horizontal) + if (m_parent->orientation() == TQt::Horizontal) { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred ); } @@ -360,14 +360,14 @@ void AppletHandleDrag::paintEvent(TQPaintEvent *) TQStyle::SFlags flags = TQStyle::Style_Default; flags |= TQStyle::Style_Enabled; - if (m_parent->orientation() == Qt::Horizontal) + if (m_parent->orientation() == TQt::Horizontal) { flags |= TQStyle::Style_Horizontal; } TQRect r = rect(); - style().tqdrawPrimitive(TQStyle::PE_DockWindowHandle, &p, r, + style().drawPrimitive(TQStyle::PE_DockWindowHandle, &p, r, colorGroup(), flags); } else @@ -387,7 +387,7 @@ TQSize AppletHandleButton::minimumSizeHint() const int height = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); int width = height; - if (m_parent->orientation() == Qt::Horizontal) + if (m_parent->orientation() == TQt::Horizontal) { return TQSize(width, height); } diff --git a/kicker/kicker/core/applethandle.h b/kicker/kicker/core/applethandle.h index 34e8e3576..578bc1dc3 100644 --- a/kicker/kicker/core/applethandle.h +++ b/kicker/kicker/core/applethandle.h @@ -37,7 +37,7 @@ class AppletHandleButton; class AppletHandle : public TQWidget { - Q_OBJECT + TQ_OBJECT public: AppletHandle(AppletContainer* parent); @@ -87,7 +87,7 @@ class AppletHandle : public TQWidget class AppletHandleDrag : public TQWidget { - Q_OBJECT + TQ_OBJECT public: AppletHandleDrag(AppletHandle* parent); @@ -109,7 +109,7 @@ class AppletHandleDrag : public TQWidget class AppletHandleButton : public SimpleArrowButton { - Q_OBJECT + TQ_OBJECT public: AppletHandleButton(AppletHandle *parent); diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp index d710a1ade..e53e831ba 100644 --- a/kicker/kicker/core/container_applet.cpp +++ b/kicker/kicker/core/container_applet.cpp @@ -79,7 +79,7 @@ AppletContainer::AppletContainer(const AppletInfo& info, _appletframe->setFrameStyle(TQFrame::NoFrame); _appletframe->installEventFilter(this); - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight, 0, 0); } @@ -92,10 +92,10 @@ AppletContainer::AppletContainer(const AppletInfo& info, _layout->addSpacing(APPLET_MARGIN); _handle = new AppletHandle(this); - _layout->addWidget(TQT_TQWIDGET(_handle), 0); - connect(_handle, TQT_SIGNAL(moveApplet(const TQPoint&)), - this, TQT_SLOT(moveApplet(const TQPoint&))); - connect(_handle, TQT_SIGNAL(showAppletMenu()), this, TQT_SLOT(showAppletMenu())); + _layout->addWidget(_handle, 0); + connect(_handle, TQ_SIGNAL(moveApplet(const TQPoint&)), + this, TQ_SLOT(moveApplet(const TQPoint&))); + connect(_handle, TQ_SIGNAL(showAppletMenu()), this, TQ_SLOT(showAppletMenu())); _layout->addWidget(_appletframe, 1); _layout->activate(); @@ -124,12 +124,12 @@ AppletContainer::AppletContainer(const AppletInfo& info, setImmutable(immutable); - connect(_applet, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout())); - connect(_applet, TQT_SIGNAL(requestFocus()), TQT_SLOT(activateWindow())); - connect(_applet, TQT_SIGNAL(requestFocus(bool)), TQT_SLOT(focusRequested(bool))); + connect(_applet, TQ_SIGNAL(updateLayout()), TQ_SLOT(slotUpdateLayout())); + connect(_applet, TQ_SIGNAL(requestFocus()), TQ_SLOT(activateWindow())); + connect(_applet, TQ_SIGNAL(requestFocus(bool)), TQ_SLOT(focusRequested(bool))); - connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), - this, TQT_SLOT(slotReconfigure())); + connect(Kicker::the(), TQ_SIGNAL(configurationChanged()), + this, TQ_SLOT(slotReconfigure())); } void AppletContainer::configure() @@ -191,7 +191,7 @@ void AppletContainer::resetLayout() { _handle->resetLayout(); - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { _layout->setDirection( TQBoxLayout::LeftToRight ); } @@ -225,7 +225,7 @@ void AppletContainer::showAppletMenu() Kicker::the()->setInsertionPoint(_handle->mapToGlobal(_handle->rect().center())); - switch(menu->exec(KickerLib::popupPosition(popupDirection(), menu, TQT_TQWIDGET(_handle)))) + switch(menu->exec(KickerLib::popupPosition(popupDirection(), menu, _handle))) { case PanelAppletOpMenu::Move: moveApplet(_handle->mapToParent(_handle->rect().center())); @@ -298,7 +298,7 @@ void AppletContainer::doSaveConfiguration( TDEConfigGroup& config, bool layoutOnly ) const { // immutability is checked by ContainerBase - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { config.writeEntry( "WidthForHeightHint", widthForHeight(height()) ); } @@ -321,8 +321,8 @@ TQPopupMenu* AppletContainer::createOpMenu() _info.name(), _info.icon(), this); - connect(opMenu, TQT_SIGNAL(escapePressed()), - _handle, TQT_SLOT(toggleMenuButtonOff())); + connect(opMenu, TQ_SIGNAL(escapePressed()), + _handle, TQ_SLOT(toggleMenuButtonOff())); return opMenu; } @@ -471,7 +471,7 @@ void AppletContainer::setImmutable(bool immutable) } else if (!_handle->isVisibleTo(this)) { - TQToolTip::add(TQT_TQWIDGET(_handle), _info.name()); + TQToolTip::add(_handle, _info.name()); _handle->show(); setBackground(); } diff --git a/kicker/kicker/core/container_applet.h b/kicker/kicker/core/container_applet.h index 458f18fe0..d5b80930e 100644 --- a/kicker/kicker/core/container_applet.h +++ b/kicker/kicker/core/container_applet.h @@ -40,7 +40,7 @@ class AppletHandle; class AppletContainer : public BaseContainer { - Q_OBJECT + TQ_OBJECT public: AppletContainer(const AppletInfo& info, TQPopupMenu* opMenu, bool isImmutable = false, TQWidget* parent = 0); diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp index e3131b2ed..64886f436 100644 --- a/kicker/kicker/core/container_base.cpp +++ b/kicker/kicker/core/container_base.cpp @@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. BaseContainer::BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent, const char * name ) : TQWidget( parent, name ) , _dir(KPanelApplet::Up) - , _orient(Qt::Horizontal) + , _orient(TQt::Horizontal) , _alignment(KPanelExtension::LeftTop) , _fspace(0) , _moveOffset(TQPoint(0,0)) @@ -47,7 +47,7 @@ BaseContainer::BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent, const , _opMnu(0) , _appletOpMnu(appletOpMenu) { - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); } BaseContainer::~BaseContainer() diff --git a/kicker/kicker/core/container_base.h b/kicker/kicker/core/container_base.h index 88e06e715..6cf61bec6 100644 --- a/kicker/kicker/core/container_base.h +++ b/kicker/kicker/core/container_base.h @@ -36,7 +36,7 @@ class TQPopupMenu; class BaseContainer : public TQWidget { - Q_OBJECT + TQ_OBJECT public: typedef TQValueList<BaseContainer*> List; diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp index 40f479308..d3a550a07 100644 --- a/kicker/kicker/core/container_button.cpp +++ b/kicker/kicker/core/container_button.cpp @@ -161,13 +161,13 @@ void ButtonContainer::embedButton(PanelButton* b) } _layout = vbox; - connect(_button, TQT_SIGNAL(requestSave()), TQT_SIGNAL(requestSave())); - connect(_button, TQT_SIGNAL(hideme(bool)), TQT_SLOT(hideRequested(bool))); - connect(_button, TQT_SIGNAL(removeme()), TQT_SLOT(removeRequested())); - connect(_button, TQT_SIGNAL(dragme(const TQPixmap)), - TQT_SLOT(dragButton(const TQPixmap))); - connect(_button, TQT_SIGNAL(dragme(const KURL::List, const TQPixmap)), - TQT_SLOT(dragButton(const KURL::List, const TQPixmap))); + connect(_button, TQ_SIGNAL(requestSave()), TQ_SIGNAL(requestSave())); + connect(_button, TQ_SIGNAL(hideme(bool)), TQ_SLOT(hideRequested(bool))); + connect(_button, TQ_SIGNAL(removeme()), TQ_SLOT(removeRequested())); + connect(_button, TQ_SIGNAL(dragme(const TQPixmap)), + TQ_SLOT(dragButton(const TQPixmap))); + connect(_button, TQ_SIGNAL(dragme(const KURL::List, const TQPixmap)), + TQ_SLOT(dragButton(const KURL::List, const TQPixmap))); } TQPopupMenu* ButtonContainer::createOpMenu() @@ -225,7 +225,7 @@ void ButtonContainer::dragButton(const TQPixmap icon) bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_button) && e->type() == TQEvent::MouseButtonPress) + if (o == _button && e->type() == TQEvent::MouseButtonPress) { static bool sentinal = false; @@ -235,10 +235,10 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) } sentinal = true; - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); switch (me->button()) { - case Qt::MidButton: + case TQt::MidButton: { if (isImmutable()) { @@ -252,7 +252,7 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) return true; } - case Qt::RightButton: + case TQt::RightButton: { if (!kapp->authorizeTDEAction("kicker_rmb") || isImmutable()) @@ -261,9 +261,9 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) } TQPopupMenu* menu = opMenu(); - connect( menu, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotMenuClosed() ) ); - TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, TQT_TQWIDGET(this), - (orientation() == Qt::Horizontal) ? + connect( menu, TQ_SIGNAL( aboutToHide() ), this, TQ_SLOT( slotMenuClosed() ) ); + TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, this, + (orientation() == TQt::Horizontal) ? TQPoint(0, 0) : me->pos()); Kicker::the()->setInsertionPoint(me->globalPos()); diff --git a/kicker/kicker/core/container_button.h b/kicker/kicker/core/container_button.h index bc24272db..d564354b0 100644 --- a/kicker/kicker/core/container_button.h +++ b/kicker/kicker/core/container_button.h @@ -36,7 +36,7 @@ class TDEConfigGroup; class ButtonContainer : public BaseContainer { - Q_OBJECT + TQ_OBJECT public: ButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0); @@ -151,7 +151,7 @@ public: WindowListButtonContainer(const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); WindowListButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0); TQString appletType() const { return "WindowListButton"; } - virtual TQString icon() const { return "window_list"; } + virtual TQString icon() const { return "window_duplicate"; } virtual TQString visibleName() const { return i18n("Windowlist"); } bool isAMenu() const { return true; } }; diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 721df418e..afb786f7f 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -137,20 +137,20 @@ void ExtensionContainer::init() KWin::setState(winId(), NET::Sticky); KWin::setOnAllDesktops(winId(), true); - connect(Kicker::the()->twinModule(), TQT_SIGNAL(strutChanged()), this, TQT_SLOT(strutChanged())); - connect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)), - this, TQT_SLOT( currentDesktopChanged(int))); + connect(Kicker::the()->twinModule(), TQ_SIGNAL(strutChanged()), this, TQ_SLOT(strutChanged())); + connect(Kicker::the()->twinModule(), TQ_SIGNAL(currentDesktopChanged(int)), + this, TQ_SLOT( currentDesktopChanged(int))); setBackgroundOrigin(AncestorOrigin); setFrameStyle(NoFrame); setLineWidth(0); setMargin(0); - connect(UnhideTrigger::the(), TQT_SIGNAL(triggerUnhide(UnhideTrigger::Trigger,int)), - this, TQT_SLOT(unhideTriggered(UnhideTrigger::Trigger,int))); + connect(UnhideTrigger::the(), TQ_SIGNAL(triggerUnhide(UnhideTrigger::Trigger,int)), + this, TQ_SLOT(unhideTriggered(UnhideTrigger::Trigger,int))); - _popupWidgetFilter = new PopupWidgetFilter( TQT_TQOBJECT(this) ); - connect(_popupWidgetFilter, TQT_SIGNAL(popupWidgetHiding()), TQT_SLOT(maybeStartAutoHideTimer())); + _popupWidgetFilter = new PopupWidgetFilter( this ); + connect(_popupWidgetFilter, TQ_SIGNAL(popupWidgetHiding()), TQ_SLOT(maybeStartAutoHideTimer())); // layout _layout = new TQGridLayout(this, 3, 3, 0, 0); @@ -160,15 +160,15 @@ void ExtensionContainer::init() // instantiate the autohide timer _autohideTimer = new TQTimer(this, "_autohideTimer"); - connect(_autohideTimer, TQT_SIGNAL(timeout()), TQT_SLOT(autoHideTimeout())); + connect(_autohideTimer, TQ_SIGNAL(timeout()), TQ_SLOT(autoHideTimeout())); // instantiate the updateLayout event compressor timer _updateLayoutTimer = new TQTimer(this, "_updateLayoutTimer"); - connect(_updateLayoutTimer, TQT_SIGNAL(timeout()), TQT_SLOT(actuallyUpdateLayout())); + connect(_updateLayoutTimer, TQ_SIGNAL(timeout()), TQ_SLOT(actuallyUpdateLayout())); installEventFilter(this); // for mouse event handling - connect(Kicker::the(), TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(updateHighlightColor())); + connect(Kicker::the(), TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(updateHighlightColor())); updateHighlightColor(); // if we were hidden when kicker quit, let's start out hidden as well! @@ -207,9 +207,9 @@ void ExtensionContainer::init() item->setDefaultValue(m_extension->customSize()); } - connect(m_extension, TQT_SIGNAL(updateLayout()), TQT_SLOT(updateLayout())); - connect(m_extension, TQT_SIGNAL(maintainFocus(bool)), - TQT_SLOT(maintainFocus(bool))); + connect(m_extension, TQ_SIGNAL(updateLayout()), TQ_SLOT(updateLayout())); + connect(m_extension, TQ_SIGNAL(maintainFocus(bool)), + TQ_SLOT(maintainFocus(bool))); _layout->addWidget(m_extension, 1, 1); } @@ -733,7 +733,7 @@ void ExtensionContainer::autoHideTimeout() { // kdDebug(1210) << "PanelContainer::autoHideTimeout() " << name() << endl; // Hack: If there is a popup open, don't autohide until it closes. - TQWidget* popup = TQT_TQWIDGET(TQApplication::activePopupWidget()); + TQWidget* popup = TQApplication::activePopupWidget(); if (popup) { @@ -885,7 +885,7 @@ void ExtensionContainer::autoHide(bool hide) _in_autohide = false; - TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects())); + TQTimer::singleShot(100, this, TQ_SLOT(enableMouseOverEffects())); } void ExtensionContainer::animatedHide(bool left) @@ -925,7 +925,7 @@ void ExtensionContainer::animatedHide(bool left) !TQApplication::desktop()->screenGeometry(s).intersects(geometry())) { blockUserInput(false); - TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects())); + TQTimer::singleShot(100, this, TQ_SLOT(enableMouseOverEffects())); return; } } @@ -988,7 +988,7 @@ void ExtensionContainer::animatedHide(bool left) config->setGroup(extensionId()); config->writeEntry("UserHidden", userHidden()); - TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects())); + TQTimer::singleShot(100, this, TQ_SLOT(enableMouseOverEffects())); } bool ExtensionContainer::reserveStrut() const @@ -1208,7 +1208,7 @@ int ExtensionContainer::arrangeHideButtons() _layout->setEnabled(false); } - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { int maxWidth = width(); @@ -1227,7 +1227,7 @@ int ExtensionContainer::arrangeHideButtons() _ltHB->setMaximumWidth(maxWidth); _ltHB->setMaximumHeight(14); _layout->remove(_ltHB); - _layout->addWidget(_ltHB, 0, 1, Qt::AlignBottom | Qt::AlignLeft); + _layout->addWidget(_ltHB, 0, 1, TQt::AlignBottom | TQt::AlignLeft); } if (_rbHB) @@ -1252,8 +1252,8 @@ int ExtensionContainer::arrangeHideButtons() maxHeight = maxHeight - (PANEL_RESIZE_HANDLE_WIDTH + PANEL_BOTTOM_SPACING_W_RESIZE_HANDLE); } - int vertAlignment = (position() == KPanelExtension::Top) ? Qt::AlignTop : 0; - int leftAlignment = Qt::AlignRight; + int vertAlignment = (position() == KPanelExtension::Top) ? TQt::AlignTop : 0; + int leftAlignment = TQt::AlignRight; if (_ltHB) { @@ -1262,11 +1262,11 @@ int ExtensionContainer::arrangeHideButtons() _layout->remove(_ltHB); if (kapp->reverseLayout()) { - _layout->addWidget(_ltHB, 1, 2, (TQ_Alignment)vertAlignment); + _layout->addWidget(_ltHB, 1, 2, (TQt::AlignmentFlags)vertAlignment); } else { - _layout->addWidget(_ltHB, 1, 0, (TQ_Alignment)(leftAlignment | vertAlignment)); + _layout->addWidget(_ltHB, 1, 0, (TQt::AlignmentFlags)(leftAlignment | vertAlignment)); } } @@ -1277,11 +1277,11 @@ int ExtensionContainer::arrangeHideButtons() _layout->remove(_rbHB); if (kapp->reverseLayout()) { - _layout->addWidget(_rbHB, 1, 0, (TQ_Alignment)(leftAlignment | vertAlignment)); + _layout->addWidget(_rbHB, 1, 0, (TQt::AlignmentFlags)(leftAlignment | vertAlignment)); } else { - _layout->addWidget(_rbHB, 1, 2, (TQ_Alignment)vertAlignment); + _layout->addWidget(_rbHB, 1, 2, (TQt::AlignmentFlags)vertAlignment); } } } @@ -1315,7 +1315,7 @@ int ExtensionContainer::setupBorderSpace() TQRect r = TQApplication::desktop()->screenGeometry(xineramaScreen()); TQRect h = geometry(); - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { if (h.top() > 0) { @@ -1417,26 +1417,26 @@ 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()); - style().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal ); + style().drawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal ); } else if (position() == KPanelExtension::Right) { rect = TQRect(0,0,PANEL_RESIZE_HANDLE_WIDTH,height()); - style().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal ); + style().drawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal ); } else if (position() == KPanelExtension::Top) { // Nastiness to both vertically flip the PE_Separator // and make sure it pops out of, not sinks into, the screen TQPixmap inv_pm(width(),PANEL_RESIZE_HANDLE_WIDTH); - TQPainter myp(TQT_TQPAINTDEVICE(&inv_pm)); + TQPainter myp(&inv_pm); rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH); TQColorGroup darkcg = colorGroup(); darkcg.setColor(TQColorGroup::Light, colorGroup().dark()); - style().tqdrawPrimitive( TQStyle::PE_Separator, &myp, rect, darkcg, TQStyle::Style_Default ); + style().drawPrimitive( 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); - style().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Default ); + style().drawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Default ); } } } @@ -1486,7 +1486,7 @@ void ExtensionContainer::unhideIfHidden(int showForAtLeastHowManyMS) { autoHide(false); TQTimer::singleShot(showForAtLeastHowManyMS, - this, TQT_SLOT(maybeStartAutoHideTimer())); + this, TQ_SLOT(maybeStartAutoHideTimer())); return; } @@ -1582,11 +1582,11 @@ KPanelExtension::Orientation ExtensionContainer::orientation() const { if (position() == KPanelExtension::Top || position() == KPanelExtension::Bottom) { - return Qt::Horizontal; + return TQt::Horizontal; } else { - return Qt::Vertical; + return TQt::Vertical; } } @@ -1627,18 +1627,18 @@ void ExtensionContainer::resetLayout() _ltHB = new HideButton(this); _ltHB->installEventFilter(this); _ltHB->setEnabled(true); - connect(_ltHB, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideLeft())); + connect(_ltHB, TQ_SIGNAL(clicked()), this, TQ_SLOT(hideLeft())); haveToArrangeButtons = true; } - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { - _ltHB->setArrowType(Qt::LeftArrow); + _ltHB->setArrowType(TQt::LeftArrow); _ltHB->setFixedSize(m_settings.hideButtonSize(), height()); } else { - _ltHB->setArrowType(Qt::UpArrow); + _ltHB->setArrowType(TQt::UpArrow); _ltHB->setFixedSize(width(), m_settings.hideButtonSize()); } @@ -1658,18 +1658,18 @@ void ExtensionContainer::resetLayout() _rbHB = new HideButton(this); _rbHB->installEventFilter(this); _rbHB->setEnabled(true); - connect(_rbHB, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideRight())); + connect(_rbHB, TQ_SIGNAL(clicked()), this, TQ_SLOT(hideRight())); haveToArrangeButtons = true; } - if ( orientation() == Qt::Horizontal) + if ( orientation() == TQt::Horizontal) { - _rbHB->setArrowType(Qt::RightArrow); + _rbHB->setArrowType(TQt::RightArrow); _rbHB->setFixedSize(m_settings.hideButtonSize(), height()); } else { - _rbHB->setArrowType(Qt::DownArrow); + _rbHB->setArrowType(TQt::DownArrow); _rbHB->setFixedSize(width(), m_settings.hideButtonSize()); } @@ -1709,7 +1709,7 @@ void ExtensionContainer::resetLayout() updateGeometry(); int endBorderWidth = haveToArrangeButtons ? arrangeHideButtons() : setupBorderSpace(); - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { if (m_extension) { @@ -2145,8 +2145,8 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) { case TQEvent::MouseButtonPress: { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if ( me->button() == Qt::LeftButton ) + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); + if ( me->button() == TQt::LeftButton ) { if (inResizeArea(me->pos())) { @@ -2170,7 +2170,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) _is_lmb_down = true; } } - else if (me->button() == Qt::RightButton) + else if (me->button() == TQt::RightButton) { showPanelMenu(me->globalPos()); return true; // don't crash! @@ -2180,8 +2180,8 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) case TQEvent::MouseButtonRelease: { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if ( me->button() == Qt::LeftButton ) + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); + if ( me->button() == TQt::LeftButton ) { _is_lmb_down = false; } @@ -2190,7 +2190,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) case TQEvent::MouseMove: { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); if (KickerSettings::useResizeHandle()) { KPanelExtension::Position pos = position(); @@ -2202,7 +2202,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) } else { - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); } } else if (pos == KPanelExtension::Right) @@ -2213,35 +2213,35 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) } else { - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); } } else if (pos == KPanelExtension::Top) { if (inResizeArea(me->pos())) { - setCursor(tqsizeVerCursor); + setCursor(TQt::sizeVerCursor); } else { - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); } } else { if (inResizeArea(me->pos())) { - setCursor(tqsizeVerCursor); + setCursor(TQt::sizeVerCursor); } else { - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); } } } if (_is_lmb_down && - ((me->state() & Qt::LeftButton) == Qt::LeftButton) && + ((me->state() & TQt::LeftButton) == TQt::LeftButton) && !Kicker::the()->isImmutable() && !m_settings.config()->isImmutable() && !ExtensionManager::the()->isMenuBar(this)) diff --git a/kicker/kicker/core/container_extension.h b/kicker/kicker/core/container_extension.h index 8948341d1..b1db1efeb 100644 --- a/kicker/kicker/core/container_extension.h +++ b/kicker/kicker/core/container_extension.h @@ -51,7 +51,7 @@ class TQColor; class ExtensionContainer : public TQFrame { - Q_OBJECT + TQ_OBJECT public: enum UserHidden { Unhidden, LeftTop, RightBottom }; @@ -203,7 +203,7 @@ private: class PopupWidgetFilter : public TQObject { - Q_OBJECT + TQ_OBJECT public: PopupWidgetFilter( TQObject *parent ); diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index 5b1eb5c8c..234aba375 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/kicker/kicker/core/containerarea.cpp @@ -103,11 +103,11 @@ ContainerArea::ContainerArea(TDEConfig* _c, setBackground(); - connect(&_autoScrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(autoScroll())); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(setBackground())); - connect(Kicker::the(), TQT_SIGNAL(immutabilityChanged(bool)), - TQT_SLOT(immutabilityChanged(bool))); - connect(this, TQT_SIGNAL(contentsMoving(int, int)), TQT_SLOT(setBackground())); + connect(&_autoScrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(autoScroll())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(setBackground())); + connect(Kicker::the(), TQ_SIGNAL(immutabilityChanged(bool)), + TQ_SLOT(immutabilityChanged(bool))); + connect(this, TQ_SIGNAL(contentsMoving(int, int)), TQ_SLOT(setBackground())); } ContainerArea::~ContainerArea() @@ -142,7 +142,7 @@ void ContainerArea::initialize(bool useDefaultConfig) } setAcceptDrops(!isImmutable()); - TQTimer::singleShot(0, this, TQT_SLOT(resizeContents())); + TQTimer::singleShot(0, this, TQ_SLOT(resizeContents())); } void ContainerArea::defaultContainerConfig() @@ -153,7 +153,7 @@ void ContainerArea::defaultContainerConfig() containers.append(new KMenuButtonContainer(m_opMenu, m_contents)); int dsize; - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { dsize = width(); } @@ -377,7 +377,7 @@ void ContainerArea::loadContainers(const TQStringList& containers) // it gets executed too soon. we need to wait until the containers are // actually resized, but we enter the event loop prior to that happening // above. - TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground())); + TQTimer::singleShot(0, this, TQ_SLOT(updateContainersBackground())); } void ContainerArea::saveContainerConfig(bool layoutOnly) @@ -728,20 +728,20 @@ void ContainerArea::addContainer(BaseContainer* a, bool arrange, int index) m_layout->add(a); } - connect(a, TQT_SIGNAL(moveme(BaseContainer*)), - TQT_SLOT(startContainerMove(BaseContainer*))); - connect(a, TQT_SIGNAL(removeme(BaseContainer*)), - TQT_SLOT(removeContainer(BaseContainer*))); - connect(a, TQT_SIGNAL(takeme(BaseContainer*)), - TQT_SLOT(takeContainer(BaseContainer*))); - connect(a, TQT_SIGNAL(requestSave()), - TQT_SLOT(slotSaveContainerConfig())); - connect(a, TQT_SIGNAL(maintainFocus(bool)), - this, TQT_SIGNAL(maintainFocus(bool))); + connect(a, TQ_SIGNAL(moveme(BaseContainer*)), + TQ_SLOT(startContainerMove(BaseContainer*))); + connect(a, TQ_SIGNAL(removeme(BaseContainer*)), + TQ_SLOT(removeContainer(BaseContainer*))); + connect(a, TQ_SIGNAL(takeme(BaseContainer*)), + TQ_SLOT(takeContainer(BaseContainer*))); + connect(a, TQ_SIGNAL(requestSave()), + TQ_SLOT(slotSaveContainerConfig())); + connect(a, TQ_SIGNAL(maintainFocus(bool)), + this, TQ_SIGNAL(maintainFocus(bool))); if (dynamic_cast<AppletContainer*>(a)) { - connect(a, TQT_SIGNAL(updateLayout()), TQT_SLOT(resizeContents())); + connect(a, TQ_SIGNAL(updateLayout()), TQ_SLOT(resizeContents())); } a->configure(orientation(), popupDirection()); @@ -824,16 +824,16 @@ void ContainerArea::takeContainer(BaseContainer* a) return; } - disconnect(a, TQT_SIGNAL(moveme(BaseContainer*)), - this, TQT_SLOT(startContainerMove(BaseContainer*))); - disconnect(a, TQT_SIGNAL(removeme(BaseContainer*)), - this, TQT_SLOT(removeContainer(BaseContainer*))); - disconnect(a, TQT_SIGNAL(takeme(BaseContainer*)), - this, TQT_SLOT(takeContainer(BaseContainer*))); - disconnect(a, TQT_SIGNAL(requestSave()), - this, TQT_SLOT(slotSaveContainerConfig())); - disconnect(a, TQT_SIGNAL(maintainFocus(bool)), - this, TQT_SIGNAL(maintainFocus(bool))); + disconnect(a, TQ_SIGNAL(moveme(BaseContainer*)), + this, TQ_SLOT(startContainerMove(BaseContainer*))); + disconnect(a, TQ_SIGNAL(removeme(BaseContainer*)), + this, TQ_SLOT(removeContainer(BaseContainer*))); + disconnect(a, TQ_SIGNAL(takeme(BaseContainer*)), + this, TQ_SLOT(takeContainer(BaseContainer*))); + disconnect(a, TQ_SIGNAL(requestSave()), + this, TQ_SLOT(slotSaveContainerConfig())); + disconnect(a, TQ_SIGNAL(maintainFocus(bool)), + this, TQ_SIGNAL(maintainFocus(bool))); // Just remove the group from our own config file. Leave separate config // files untouched. @@ -850,7 +850,7 @@ void ContainerArea::resizeContents() int w = width(); int h = height(); - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { int newWidth = m_layout->widthForHeight(h); if (newWidth > w) @@ -923,7 +923,7 @@ void ContainerArea::startContainerMove(BaseContainer *a) KickerTip::enableTipping(false); emit maintainFocus(true); setMouseTracking(true); - grabMouse(tqsizeAllCursor); + grabMouse(TQt::sizeAllCursor); m_layout->setStretchEnabled(false); a->raise(); @@ -940,7 +940,7 @@ void ContainerArea::mouseReleaseEvent(TQMouseEvent *) // so we need to complete the move here _autoScrollTimer.stop(); releaseMouse(); - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); setMouseTracking(false); _moveAC->completeMoveOperation(); @@ -962,12 +962,12 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev) return; } - if (ev->state() == Qt::LeftButton && !TQT_TQRECT_OBJECT(rect()).contains(ev->pos())) + if (ev->state() == TQt::LeftButton && !rect().contains(ev->pos())) { // leaveEvent() doesn't work, while grabbing the mouse _autoScrollTimer.stop(); releaseMouse(); - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); setMouseTracking(false); _moveAC->completeMoveOperation(); @@ -986,7 +986,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev) return; } - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { int oldX = _moveAC->x() + _moveAC->moveOffset().x(); int x = ev->pos().x() + contentsX(); @@ -1082,7 +1082,7 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev) preferedHeight = draggedContainer->heightForWidth(width()); } - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { _dragIndicator->setPreferredSize(TQSize(preferedWidth, height())); } @@ -1103,9 +1103,9 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev) --it; BaseContainer* a = *it; - if ((orientation() == Qt::Horizontal && + if ((orientation() == TQt::Horizontal && a->x() < (ev->pos().x() + contentsX()) - _dragMoveOffset.x()) || - (orientation() == Qt::Vertical && + (orientation() == TQt::Vertical && a->y() < (ev->pos().y() + contentsY()) - _dragMoveOffset.y())) { _dragMoveAC = a; @@ -1114,7 +1114,7 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev) } while (it != m_containers.begin()); } - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { moveDragIndicator(ev->pos().x() + contentsX() - _dragMoveOffset.x()); } @@ -1143,7 +1143,7 @@ void ContainerArea::dragMoveEvent(TQDragMoveEvent* ev) startContainerMove(_moveAC); // Align the container to the mouse position. - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { m_layout->moveContainerSwitch(_moveAC, ev->pos().x() + contentsX() - _moveAC->x()); } @@ -1159,7 +1159,7 @@ void ContainerArea::dragMoveEvent(TQDragMoveEvent* ev) return; } - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { moveDragIndicator(ev->pos().x() + contentsX() - _dragMoveOffset.x()); } @@ -1201,7 +1201,7 @@ void ContainerArea::dropEvent(TQDropEvent *ev) } TQObject *parent = ev->source() ? ev->source()->parent() : 0; - while (parent && (TQT_BASE_OBJECT(parent) != TQT_BASE_OBJECT(this))) + while (parent && (parent != this)) { parent = parent->parent(); } @@ -1209,13 +1209,13 @@ void ContainerArea::dropEvent(TQDropEvent *ev) if (parent) { // Move container a - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { int oldX = a->x(); int x = _dragIndicator->x(); m_layout->moveContainerSwitch(a, x - oldX); } - else if (orientation() == Qt::Vertical) + else if (orientation() == TQt::Vertical) { int oldY = a->y(); int y = _dragIndicator->y(); @@ -1387,7 +1387,7 @@ bool ContainerArea::eventFilter(TQObject* o, TQEvent* e) // which contain a ContainerArea can react to layout changes of its // contents. For example: If an applets grows, the top level widget may // want to grow as well. - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_contents)) + if (o == m_contents) { if (e->type() == TQEvent::LayoutHint) { @@ -1408,7 +1408,7 @@ void ContainerArea::resizeEvent(TQResizeEvent *ev) void ContainerArea::viewportResizeEvent(TQResizeEvent* ev) { Panner::viewportResizeEvent(ev); - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { m_contents->resize(kMax(widthForHeight(ev->size().height()), ev->size().width()), @@ -1436,8 +1436,8 @@ void ContainerArea::setBackground() { _rootPixmap = new KRootPixmap(this); _rootPixmap->setCustomPainting(true); - connect(_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap&)), - TQT_SLOT(updateBackground(const TQPixmap&))); + connect(_rootPixmap, TQ_SIGNAL(backgroundUpdated(const TQPixmap&)), + TQ_SLOT(updateBackground(const TQPixmap&))); } else { @@ -1487,7 +1487,7 @@ void ContainerArea::setBackground() { TQImage bgImage = srcImage; - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { if (KickerSettings::rotateBackground()) { @@ -1516,7 +1516,7 @@ void ContainerArea::setBackground() KickerLib::colorize(bgImage); } setPaletteBackgroundPixmap(TQPixmap(bgImage)); - TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground())); + TQTimer::singleShot(0, this, TQ_SLOT(updateContainersBackground())); } } @@ -1538,7 +1538,7 @@ void ContainerArea::immutabilityChanged(bool immutable) } setAcceptDrops(!isImmutable()); - TQTimer::singleShot(0, this, TQT_SLOT(setBackground())); + TQTimer::singleShot(0, this, TQ_SLOT(setBackground())); } TQRect ContainerArea::availableSpaceFollowing(BaseContainer* a) @@ -1565,7 +1565,7 @@ TQRect ContainerArea::availableSpaceFollowing(BaseContainer* a) } } - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { if (a) { @@ -1599,7 +1599,7 @@ void ContainerArea::moveDragIndicator(int pos) // Move _dragIndicator to position pos, restricted by availableSpace. // Resize _dragIndicator if necessary. - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { if (availableSpace.size().width() < _dragIndicator->preferredSize().width()) @@ -1663,7 +1663,7 @@ void ContainerArea::resizeContents(int w, int h) if (!m_updateBackgroundsCalled) { m_updateBackgroundsCalled = true; - TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground())); + TQTimer::singleShot(0, this, TQ_SLOT(updateContainersBackground())); } } @@ -1680,9 +1680,9 @@ void ContainerArea::setPosition(KPanelExtension::Position p) } _pos = p; - Qt::Orientation o = (p == KPanelExtension::Top || + TQt::Orientation o = (p == KPanelExtension::Top || p == KPanelExtension::Bottom) ? - Qt::Horizontal : Qt::Vertical; + TQt::Horizontal : TQt::Vertical; bool orientationChanged = (orientation() != o); m_layout->setEnabled(false); @@ -1696,7 +1696,7 @@ void ContainerArea::setPosition(KPanelExtension::Position p) // when that gets called AFTER we've been moved // it's not always safe to do the resize here, as scroll buttons // from the panner may get in our way. =/ - if (o == Qt::Horizontal) + if (o == TQt::Horizontal) { resizeContents(0, height()); } @@ -1742,7 +1742,7 @@ void ContainerArea::autoScroll() { if(!_moveAC) return; - if(orientation() == Qt::Horizontal) { + if(orientation() == TQt::Horizontal) { if(_moveAC->pos().x() <= 80) scrollBy(-10, 0); else if(_moveAC->pos().x() >= width() - _moveAC->width() - 80) @@ -1793,7 +1793,7 @@ void ContainerArea::updateContainersBackground() if( !m_cachedGeometry.contains( *it )) { m_cachedGeometry[ *it ] = TQRect(); - connect( *it, TQT_SIGNAL( destroyed()), TQT_SLOT( destroyCachedGeometry())); + connect( *it, TQ_SIGNAL( destroyed()), TQ_SLOT( destroyCachedGeometry())); } if( m_cachedGeometry[ *it ] != (*it)->geometry()) { @@ -1910,7 +1910,7 @@ void ContainerArea::showAddAppletDialog() if (!m_addAppletDialog) { m_addAppletDialog = new AddAppletDialog(this, this, 0); - connect(m_addAppletDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(addAppletDialogDone())); + connect(m_addAppletDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(addAppletDialogDone())); } else { @@ -1958,7 +1958,7 @@ void DragIndicator::paintEvent(TQPaintEvent*) { TQPainter painter(this); TQRect rect(0, 0, width(), height()); - style().tqdrawPrimitive( TQStyle::PE_FocusRect, &painter, rect, colorGroup(), + style().drawPrimitive( TQStyle::PE_FocusRect, &painter, rect, colorGroup(), TQStyle::Style_Default, colorGroup().base() ); } diff --git a/kicker/kicker/core/containerarea.h b/kicker/kicker/core/containerarea.h index f52003982..2b543e6ac 100644 --- a/kicker/kicker/core/containerarea.h +++ b/kicker/kicker/core/containerarea.h @@ -45,7 +45,7 @@ class AddAppletDialog; class ContainerArea : public Panner { - Q_OBJECT + TQ_OBJECT public: ContainerArea( TDEConfig* config, TQWidget* parent, TQPopupMenu* opMenu, const char* name = 0 ); @@ -174,7 +174,7 @@ private: class DragIndicator : public TQWidget { - Q_OBJECT + TQ_OBJECT public: DragIndicator(TQWidget* parent = 0, const char* name = 0); diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp index c12778fbb..81080fe82 100644 --- a/kicker/kicker/core/containerarealayout.cpp +++ b/kicker/kicker/core/containerarealayout.cpp @@ -122,7 +122,7 @@ void ContainerAreaLayoutItem::setFreeSpaceRatio(double ratio) m_freeSpaceRatio = ratio; } -Qt::Orientation ContainerAreaLayoutItem::orientation() const +TQt::Orientation ContainerAreaLayoutItem::orientation() const { return m_layout->orientation(); } @@ -139,7 +139,7 @@ void ContainerAreaLayoutItem::setGeometryR(const TQRect& r) int ContainerAreaLayoutItem::widthForHeightR(int h) const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return widthForHeight(h); } @@ -151,7 +151,7 @@ int ContainerAreaLayoutItem::widthForHeightR(int h) const int ContainerAreaLayoutItem::widthR() const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return geometry().width(); } @@ -163,7 +163,7 @@ int ContainerAreaLayoutItem::widthR() const int ContainerAreaLayoutItem::heightR() const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return geometry().height(); } @@ -175,7 +175,7 @@ int ContainerAreaLayoutItem::heightR() const int ContainerAreaLayoutItem::leftR() const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { if (TQApplication::reverseLayout()) return m_layout->geometry().right() - geometry().right(); @@ -190,7 +190,7 @@ int ContainerAreaLayoutItem::leftR() const int ContainerAreaLayoutItem::rightR() const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { if (TQApplication::reverseLayout()) return m_layout->geometry().right() - geometry().left(); @@ -206,46 +206,14 @@ int ContainerAreaLayoutItem::rightR() const ContainerAreaLayout::ContainerAreaLayout(TQWidget* parent) : TQLayout(parent), - m_orientation(Qt::Horizontal), + m_orientation(TQt::Horizontal), m_stretchEnabled(true) { } -#ifdef USE_QT4 -/*! - \reimp -*/ -int ContainerAreaLayout::count() const { - return m_items.count(); -} - -/*! - \reimp -*/ -TQLayoutItem* ContainerAreaLayout::itemAt(int index) const { - return index >= 0 && index < m_items.count() ? (*m_items.at(index))->item : 0; -} - -/*! - \reimp -*/ -TQLayoutItem* ContainerAreaLayout::takeAt(int index) { - if (index < 0 || index >= m_items.count()) - return 0; - ContainerAreaLayoutItem *b = *m_items.at(index); - m_items.remove(m_items.at(index)); - TQLayoutItem *item = b->item; - b->item = 0; - delete b; - - invalidate(); - return item; -} -#endif // USE_QT4 - void ContainerAreaLayout::addItem(TQLayoutItem* item) { - m_items.append(new ContainerAreaLayoutItem(static_cast<TQLayoutItem*>(item), this)); + m_items.append(new ContainerAreaLayoutItem(item, this)); } void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertionPoint) @@ -283,7 +251,7 @@ void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertio return; } - int insPos = (orientation() == Qt::Horizontal) ? insertionPoint.x(): insertionPoint.y(); + int insPos = (orientation() == TQt::Horizontal) ? insertionPoint.x(): insertionPoint.y(); Item* current = *currentIt; Item* next = *nextIt; @@ -419,7 +387,7 @@ TQSize ContainerAreaLayout::sizeHint() const { const int size = KickerLib::sizeValue(KPanelExtension::SizeSmall); - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return TQSize(widthForHeight(size), size); } @@ -433,7 +401,7 @@ TQSize ContainerAreaLayout::minimumSize() const { const int size = KickerLib::sizeValue(KPanelExtension::SizeTiny); - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return TQSize(widthForHeight(size), size); } @@ -445,13 +413,7 @@ TQSize ContainerAreaLayout::minimumSize() const TQLayoutIterator ContainerAreaLayout::iterator() { - // [FIXME] -#ifdef USE_QT4 - #warning [FIXME] ContainerAreaLayout iterators may not function correctly under Qt4 - return TQLayoutIterator(this); // [FIXME] -#else // USE_QT4 return TQLayoutIterator(new ContainerAreaLayoutIterator(&m_items)); -#endif // USE_QT4 } void ContainerAreaLayout::setGeometry(const TQRect& rect) @@ -559,7 +521,7 @@ int ContainerAreaLayout::distanceToPreviousItem(ItemList::const_iterator it) con void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance) { - const bool horizontal = orientation() == Qt::Horizontal; + const bool horizontal = orientation() == TQt::Horizontal; const bool reverseLayout = TQApplication::reverseLayout(); if (horizontal && reverseLayout) @@ -696,7 +658,7 @@ void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance) int ContainerAreaLayout::moveContainerPush(TQWidget* a, int distance) { - const bool horizontal = orientation() == Qt::Horizontal; + const bool horizontal = orientation() == TQt::Horizontal; const bool reverseLayout = TQApplication::reverseLayout(); // Get the iterator 'it' pointing to the layoutitem representing 'a'. @@ -767,7 +729,7 @@ int ContainerAreaLayout::moveContainerPushRecursive(ItemList::const_iterator it, TQRect ContainerAreaLayout::transform(const TQRect& r) const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { if (TQApplication::reverseLayout()) { @@ -788,7 +750,7 @@ TQRect ContainerAreaLayout::transform(const TQRect& r) const int ContainerAreaLayout::widthForHeightR(int h) const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return widthForHeight(h); } @@ -800,7 +762,7 @@ int ContainerAreaLayout::widthForHeightR(int h) const int ContainerAreaLayout::widthR() const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return geometry().width(); } @@ -812,7 +774,7 @@ int ContainerAreaLayout::widthR() const int ContainerAreaLayout::heightR() const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return geometry().height(); } @@ -824,7 +786,7 @@ int ContainerAreaLayout::heightR() const int ContainerAreaLayout::leftR() const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) return geometry().left(); else return geometry().top(); @@ -832,7 +794,7 @@ int ContainerAreaLayout::leftR() const int ContainerAreaLayout::rightR() const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) return geometry().right(); else return geometry().bottom(); diff --git a/kicker/kicker/core/containerarealayout.h b/kicker/kicker/core/containerarealayout.h index 4edeb8be2..abb28c6f0 100644 --- a/kicker/kicker/core/containerarealayout.h +++ b/kicker/kicker/core/containerarealayout.h @@ -108,12 +108,6 @@ class ContainerAreaLayout : public TQLayout int leftR() const; int rightR() const; -#ifdef USE_QT4 - - QLAYOUT_REQUIRED_METHOD_DECLARATIONS - -#endif // USE_QT4 - private: int moveContainerPushRecursive(ItemList::const_iterator it, int distance); int distanceToPreviousItem(ItemList::const_iterator it) const; diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp index 796b98125..cb20c7a58 100644 --- a/kicker/kicker/core/extensionmanager.cpp +++ b/kicker/kicker/core/extensionmanager.cpp @@ -179,7 +179,7 @@ void ExtensionManager::initialize() m_loadingContainers = false; pm->clearUntrustedLists(); - connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), TQT_SLOT(configurationChanged())); + connect(Kicker::the(), TQ_SIGNAL(configurationChanged()), TQ_SLOT(configurationChanged())); DCOPRef r( "ksmserver", "ksmserver" ); r.send( "resumeStartup", TQCString( "kicker" )); } @@ -222,7 +222,7 @@ void ExtensionManager::configureMenubar(bool duringInit) updateMenubar(); m_menubarPanel->show(); - connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), TQT_SLOT(updateMenubar())); + connect(kapp, TQ_SIGNAL(tdedisplayFontChanged()), TQ_SLOT(updateMenubar())); } else if (m_menubarPanel) { @@ -437,8 +437,8 @@ void ExtensionManager::addContainer(ExtensionContainer* e) _containers.append(e); - connect(e, TQT_SIGNAL(removeme(ExtensionContainer*)), - this, TQT_SLOT(removeContainer(ExtensionContainer*))); + connect(e, TQ_SIGNAL(removeme(ExtensionContainer*)), + this, TQ_SLOT(removeContainer(ExtensionContainer*))); if (!m_loadingContainers) { emit desktopIconsAreaChanged(desktopIconsArea(e->xineramaScreen()), diff --git a/kicker/kicker/core/extensionmanager.h b/kicker/kicker/core/extensionmanager.h index b4a53ec31..1e36bca56 100644 --- a/kicker/kicker/core/extensionmanager.h +++ b/kicker/kicker/core/extensionmanager.h @@ -33,7 +33,7 @@ const int XineramaAllScreens = -2; class ExtensionManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: static ExtensionManager* the(); diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp index 94517607e..19c348851 100644 --- a/kicker/kicker/core/kicker.cpp +++ b/kicker/kicker/core/kicker.cpp @@ -77,7 +77,7 @@ Kicker::Kicker() // this means we've most likely crashed once. so let's see if we // stay up for more than 2 minutes time, and if so reset the // crash handler since the crash isn't a frequent offender - TQTimer::singleShot(120000, this, TQT_SLOT(setCrashHandler())); + TQTimer::singleShot(120000, this, TQ_SLOT(setCrashHandler())); } else { @@ -116,7 +116,7 @@ Kicker::Kicker() // initialize our keys // note that this creates the KMenu by calling MenuManager::the() - keys = new TDEGlobalAccel( TQT_TQOBJECT(this) ); + keys = new TDEGlobalAccel( this ); #define KICKER_ALL_BINDINGS #include "kickerbindings.cpp" keys->readSettings(); @@ -125,19 +125,19 @@ Kicker::Kicker() // set up our global settings configure(); - connect(this, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); - connect(this, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged())); - connect(this, TQT_SIGNAL(tdedisplayStyleChanged()), TQT_SLOT(slotStyleChanged())); + connect(this, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); + connect(this, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged())); + connect(this, TQ_SIGNAL(tdedisplayStyleChanged()), TQ_SLOT(slotStyleChanged())); #if (TQT_VERSION-0 >= 0x030200) // XRANDR support - connect(desktop(), TQT_SIGNAL(resized(int)), TQT_SLOT(slotDesktopResized())); + connect(desktop(), TQ_SIGNAL(resized(int)), TQ_SLOT(slotDesktopResized())); #endif // the panels, aka extensions - TQTimer::singleShot(0, ExtensionManager::the(), TQT_SLOT(initialize())); + TQTimer::singleShot(0, ExtensionManager::the(), TQ_SLOT(initialize())); - connect(ExtensionManager::the(), TQT_SIGNAL(desktopIconsAreaChanged(const TQRect &, int)), - this, TQT_SLOT(slotDesktopIconsAreaChanged(const TQRect &, int))); + connect(ExtensionManager::the(), TQ_SIGNAL(desktopIconsAreaChanged(const TQRect &, int)), + this, TQ_SLOT(slotDesktopIconsAreaChanged(const TQRect &, int))); } Kicker::~Kicker() @@ -258,7 +258,7 @@ void Kicker::quit() void Kicker::restart() { // do this on a timer to give us time to return true - TQTimer::singleShot(0, this, TQT_SLOT(slotRestart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRestart())); } void Kicker::slotRestart() @@ -352,7 +352,7 @@ void Kicker::showConfig(const TQString& configPath, const TQString& configFile, moduleNumber++; } - connect(m_configDialog, TQT_SIGNAL(finished()), TQT_SLOT(configDialogFinished())); + connect(m_configDialog, TQ_SIGNAL(finished()), TQ_SLOT(configDialogFinished())); } if (!configPath.isEmpty()) diff --git a/kicker/kicker/core/kicker.h b/kicker/kicker/core/kicker.h index 6a3e02d36..1868c0bbe 100644 --- a/kicker/kicker/core/kicker.h +++ b/kicker/kicker/core/kicker.h @@ -38,7 +38,7 @@ class PanelPopupButton; class Kicker : public KUniqueApplication { - Q_OBJECT + TQ_OBJECT K_DCOP public: diff --git a/kicker/kicker/core/kickerbindings.cpp b/kicker/kicker/core/kickerbindings.cpp index 46cfa432d..e8999a22d 100644 --- a/kicker/kicker/core/kickerbindings.cpp +++ b/kicker/kicker/core/kickerbindings.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef NOSLOTS # define DEF( name, key3, key4, target, fnSlot ) \ - keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(target), TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, target, TQ_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, target, fnSlot ) \ keys->insert( name, i18n(name), TQString(), key3, key4 ) @@ -37,12 +37,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifdef LAUNCH_MENU keys->insert("Program:kicker", i18n("Panel")); - DEF(I18N_NOOP("Popup Launch Menu" ), ALT+Qt::Key_F1, WIN+Qt::Key_Menu, + DEF(I18N_NOOP("Popup Launch Menu" ), ALT+TQt::Key_F1, WIN+TQt::Key_Menu, MenuManager::the(), kmenuAccelActivated()); #endif #ifdef SHOW_DESKTOP - DEF(I18N_NOOP( "Toggle Showing Desktop" ), ALT+CTRL+Qt::Key_D, WIN+CTRL+Qt::Key_D, + DEF(I18N_NOOP( "Toggle Showing Desktop" ), ALT+CTRL+TQt::Key_D, WIN+CTRL+TQt::Key_D, this, slotToggleShowDesktop()); #endif diff --git a/kicker/kicker/core/menumanager.cpp b/kicker/kicker/core/menumanager.cpp index a7326844e..94ee0acfb 100644 --- a/kicker/kicker/core/menumanager.cpp +++ b/kicker/kicker/core/menumanager.cpp @@ -71,8 +71,8 @@ MenuManager::MenuManager(TQObject *parent) m_kmenu = new KMenuStub(new KMenu); kapp->dcopClient()->setNotifications(true); - connect(kapp->dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)), - this, TQT_SLOT(applicationRemoved(const TQCString&))); + connect(kapp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)), + this, TQ_SLOT(applicationRemoved(const TQCString&))); } MenuManager::~MenuManager() @@ -164,7 +164,7 @@ void MenuManager::kmenuAccelActivated() // the item under the cursor gets selected. The single shot // avoids this from happening by allowing the item to be selected // when the event loop is enterred, and then resetting it. - TQTimer::singleShot(0, this, TQT_SLOT(slotSetKMenuItemActive())); + TQTimer::singleShot(0, this, TQ_SLOT(slotSetKMenuItemActive())); } else { diff --git a/kicker/kicker/core/menumanager.h b/kicker/kicker/core/menumanager.h index 1139b0b61..03e107767 100644 --- a/kicker/kicker/core/menumanager.h +++ b/kicker/kicker/core/menumanager.h @@ -40,7 +40,7 @@ typedef TQValueList<PanelPopupButton*> KButtonList; */ class MenuManager : public TQObject, DCOPObject { - Q_OBJECT + TQ_OBJECT public: static MenuManager* the(); diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp index 93bd2356b..e55f65697 100644 --- a/kicker/kicker/core/panelextension.cpp +++ b/kicker/kicker/core/panelextension.cpp @@ -71,7 +71,7 @@ PanelExtension::PanelExtension(const TQString& configFile, TQWidget *parent, con // container area _containerArea = new ContainerArea( config(), this, opMenu() ); - connect(_containerArea, TQT_SIGNAL(maintainFocus(bool)), this, TQT_SIGNAL(maintainFocus(bool))); + connect(_containerArea, TQ_SIGNAL(maintainFocus(bool)), this, TQ_SIGNAL(maintainFocus(bool))); _layout->addWidget(_containerArea); _containerArea->viewport()->installEventFilter(this); @@ -81,15 +81,15 @@ PanelExtension::PanelExtension(const TQString& configFile, TQWidget *parent, con // beginning. positionChange(position()); - connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), - TQT_SLOT(configurationChanged())); - connect(Kicker::the(), TQT_SIGNAL(immutabilityChanged(bool)), - TQT_SLOT(immutabilityChanged(bool))); + connect(Kicker::the(), TQ_SIGNAL(configurationChanged()), + TQ_SLOT(configurationChanged())); + connect(Kicker::the(), TQ_SIGNAL(immutabilityChanged(bool)), + TQ_SLOT(immutabilityChanged(bool))); // we wait to get back to the event loop to start up the container area so that // the main panel in ExtensionManager will be assigned and we can tell in a // relatively non-hackish way that we are (or aren't) the "main panel" - TQTimer::singleShot(0, this, TQT_SLOT(populateContainerArea())); + TQTimer::singleShot(0, this, TQ_SLOT(populateContainerArea())); } PanelExtension::~PanelExtension() @@ -129,7 +129,7 @@ TQPopupMenu* PanelExtension::opMenu() } _opMnu = new TQPopupMenu(this); - connect(_opMnu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotBuildOpMenu())); + connect(_opMnu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotBuildOpMenu())); return _opMnu; } @@ -162,7 +162,7 @@ bool PanelExtension::eventFilter(TQObject*, TQEvent * e) if ( e->type() == TQEvent::MouseButtonPress ) { TQMouseEvent* me = (TQMouseEvent*) e; - if ( me->button() == Qt::RightButton && kapp->authorize("action/kicker_rmb")) + if ( me->button() == TQt::RightButton && kapp->authorize("action/kicker_rmb")) { Kicker::the()->setInsertionPoint(me->globalPos()); opMenu()->exec(me->globalPos()); @@ -339,7 +339,7 @@ void PanelExtension::slotBuildOpMenu() { _opMnu->insertItem(isMenuBar ? i18n("Add &Applet to Menubar...") : i18n("Add &Applet to Panel..."), - _containerArea, TQT_SLOT(showAddAppletDialog())); + _containerArea, TQ_SLOT(showAddAppletDialog())); m_panelAddMenu = new PanelAddButtonMenu(_containerArea, this); _opMnu->insertItem(isMenuBar ? i18n("Add Appli&cation to Menubar") : i18n("Add Appli&cation to Panel"), @@ -362,7 +362,7 @@ void PanelExtension::slotBuildOpMenu() } _opMnu->insertItem(SmallIconSet("system-lock-screen"), i18n("&Lock Panels"), - Kicker::the(), TQT_SLOT(toggleLock())); + Kicker::the(), TQ_SLOT(toggleLock())); } else if (!Kicker::the()->isKioskImmutable()) { @@ -370,20 +370,20 @@ void PanelExtension::slotBuildOpMenu() SmallIconSet("system-lock-screen"), kickerImmutable ? i18n("Un&lock Panels") : i18n("&Lock Panels"), - Kicker::the(), TQT_SLOT(toggleLock())); + Kicker::the(), TQ_SLOT(toggleLock())); } if (!isMenuBar && !Kicker::the()->isKioskImmutable()) { _opMnu->insertItem(SmallIconSet("configure"), i18n("&Configure Panel..."), - this, TQT_SLOT(showConfig())); + this, TQ_SLOT(showConfig())); _opMnu->insertSeparator(); } _opMnu->insertItem(SmallIconSet("fork"), i18n("&Launch Process Manager..."), - this, TQT_SLOT(showProcessManager())); + this, TQ_SLOT(showProcessManager())); _opMnu->insertSeparator(); if (kapp->authorize("action/help")) diff --git a/kicker/kicker/core/panelextension.h b/kicker/kicker/core/panelextension.h index c7882291f..02460b00b 100644 --- a/kicker/kicker/core/panelextension.h +++ b/kicker/kicker/core/panelextension.h @@ -40,7 +40,7 @@ class TQGridLayout; class PanelExtension : public KPanelExtension, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: @@ -109,7 +109,7 @@ private: class MenubarExtension : public PanelExtension { - Q_OBJECT + TQ_OBJECT public: MenubarExtension(const AppletInfo& info); diff --git a/kicker/kicker/core/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp index a8b79877a..78db46495 100644 --- a/kicker/kicker/core/pluginmanager.cpp +++ b/kicker/kicker/core/pluginmanager.cpp @@ -123,8 +123,8 @@ PluginManager::~PluginManager() AppletInfo::Dict::const_iterator it = _dict.constBegin(); for (; it != _dict.constEnd(); ++it) { - disconnect(it.key(), TQT_SIGNAL(destroyed( TQObject*)), - this, TQT_SLOT(slotPluginDestroyed(TQObject*))); + disconnect(it.key(), TQ_SIGNAL(destroyed( TQObject*)), + this, TQ_SLOT(slotPluginDestroyed(TQObject*))); delete it.data(); } @@ -159,9 +159,9 @@ KPanelApplet* PluginManager::loadApplet(const AppletInfo& info, if (applet) { - _dict.insert( TQT_TQOBJECT(applet), new AppletInfo( info ) ); - connect( applet, TQT_SIGNAL( destroyed( TQObject* ) ), - TQT_SLOT( slotPluginDestroyed( TQObject* ) ) ); + _dict.insert( applet, new AppletInfo( info ) ); + connect( applet, TQ_SIGNAL( destroyed( TQObject* ) ), + TQ_SLOT( slotPluginDestroyed( TQObject* ) ) ); } return applet; @@ -197,9 +197,9 @@ KPanelExtension* PluginManager::loadExtension( KPanelExtension* extension = init_ptr( parent, info.configFile() ); if( extension ) { - _dict.insert( TQT_TQOBJECT(extension), new AppletInfo( info ) ); - connect( extension, TQT_SIGNAL( destroyed( TQObject* ) ), - TQT_SLOT( slotPluginDestroyed( TQObject* ) ) ); + _dict.insert( extension, new AppletInfo( info ) ); + connect( extension, TQ_SIGNAL( destroyed( TQObject* ) ), + TQ_SLOT( slotPluginDestroyed( TQObject* ) ) ); } return extension; @@ -360,12 +360,12 @@ LibUnloader::LibUnloader( const TQString &libName, TQObject *parent ) { // NOTE: this doesn't work on kicker shutdown because the timer never gets // fired. - TQTimer::singleShot( 0, this, TQT_SLOT( unload() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( unload() ) ); } void LibUnloader::unload( const TQString &libName ) { - (void)new LibUnloader( libName, TQT_TQOBJECT(kapp) ); + (void)new LibUnloader( libName, kapp ); } void LibUnloader::unload() diff --git a/kicker/kicker/core/pluginmanager.h b/kicker/kicker/core/pluginmanager.h index f67c13490..d78d1b07a 100644 --- a/kicker/kicker/core/pluginmanager.h +++ b/kicker/kicker/core/pluginmanager.h @@ -40,7 +40,7 @@ class TQPopupMenu; class KDE_EXPORT PluginManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: static PluginManager* the(); @@ -90,7 +90,7 @@ private: class LibUnloader : public TQObject { - Q_OBJECT + TQ_OBJECT public: static void unload( const TQString &libName ); diff --git a/kicker/kicker/core/showdesktop.cpp b/kicker/kicker/core/showdesktop.cpp index 4a6639574..0a1e2907c 100644 --- a/kicker/kicker/core/showdesktop.cpp +++ b/kicker/kicker/core/showdesktop.cpp @@ -49,8 +49,8 @@ ShowDesktop::ShowDesktop() m_wmSupport = i.isSupported( NET::WM2ShowingDesktop ); if( m_wmSupport ) { - connect( Kicker::the()->twinModule(), TQT_SIGNAL( showingDesktopChanged( bool )), - TQT_SLOT( showingDesktopChanged( bool ))); + connect( Kicker::the()->twinModule(), TQ_SIGNAL( showingDesktopChanged( bool )), + TQ_SLOT( showingDesktopChanged( bool ))); showingDesktopChanged( m_showingDesktop = Kicker::the()->twinModule()->showingDesktop()); } } @@ -161,21 +161,21 @@ void ShowDesktop::showDesktop( bool b ) } // on desktop changes or when a window is deiconified, we abort the show desktop mode - connect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)), - TQT_SLOT(slotCurrentDesktopChanged(int))); - connect(Kicker::the()->twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)), - TQT_SLOT(slotWindowChanged(WId,unsigned int))); - connect(Kicker::the()->twinModule(), TQT_SIGNAL(windowAdded(WId)), - TQT_SLOT(slotWindowAdded(WId))); + connect(Kicker::the()->twinModule(), TQ_SIGNAL(currentDesktopChanged(int)), + TQ_SLOT(slotCurrentDesktopChanged(int))); + connect(Kicker::the()->twinModule(), TQ_SIGNAL(windowChanged(WId,unsigned int)), + TQ_SLOT(slotWindowChanged(WId,unsigned int))); + connect(Kicker::the()->twinModule(), TQ_SIGNAL(windowAdded(WId)), + TQ_SLOT(slotWindowAdded(WId))); } else { - disconnect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)), - this, TQT_SLOT(slotCurrentDesktopChanged(int))); - disconnect(Kicker::the()->twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)), - this, TQT_SLOT(slotWindowChanged(WId,unsigned int))); - disconnect(Kicker::the()->twinModule(), TQT_SIGNAL(windowAdded(WId)), - this, TQT_SLOT(slotWindowAdded(WId))); + disconnect(Kicker::the()->twinModule(), TQ_SIGNAL(currentDesktopChanged(int)), + this, TQ_SLOT(slotCurrentDesktopChanged(int))); + disconnect(Kicker::the()->twinModule(), TQ_SIGNAL(windowChanged(WId,unsigned int)), + this, TQ_SLOT(slotWindowChanged(WId,unsigned int))); + disconnect(Kicker::the()->twinModule(), TQ_SIGNAL(windowAdded(WId)), + this, TQ_SLOT(slotWindowAdded(WId))); for (TQValueVector<WId>::ConstIterator it = m_iconifiedList.begin(); it != m_iconifiedList.end(); diff --git a/kicker/kicker/core/showdesktop.h b/kicker/kicker/core/showdesktop.h index 88cc7d7c7..ec7119438 100644 --- a/kicker/kicker/core/showdesktop.h +++ b/kicker/kicker/core/showdesktop.h @@ -33,7 +33,7 @@ class KWinModule; */ class ShowDesktop : public TQObject { - Q_OBJECT + TQ_OBJECT public: static ShowDesktop* the(); diff --git a/kicker/kicker/core/unhidetrigger.cpp b/kicker/kicker/core/unhidetrigger.cpp index 0a5093a61..1acc182f6 100644 --- a/kicker/kicker/core/unhidetrigger.cpp +++ b/kicker/kicker/core/unhidetrigger.cpp @@ -40,7 +40,7 @@ UnhideTrigger::UnhideTrigger() , enabledCount( 0 ) { _timer = new TQTimer( this, "UnhideTrigger" ); - connect( _timer, TQT_SIGNAL(timeout()), TQT_SLOT(pollMouse()) ); + connect( _timer, TQ_SIGNAL(timeout()), TQ_SLOT(pollMouse()) ); } void UnhideTrigger::setEnabled( bool enable ) diff --git a/kicker/kicker/core/unhidetrigger.h b/kicker/kicker/core/unhidetrigger.h index af05a43f5..472009014 100644 --- a/kicker/kicker/core/unhidetrigger.h +++ b/kicker/kicker/core/unhidetrigger.h @@ -32,9 +32,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqobject.h> -class UnhideTrigger : public QObject +class UnhideTrigger : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum Trigger { None = 0, Top, TopRight, Right, BottomRight, Bottom, BottomLeft, Left, TopLeft }; static UnhideTrigger* the(); diff --git a/kicker/kicker/core/userrectsel.cpp b/kicker/kicker/core/userrectsel.cpp index d48c43aad..04a2a4afd 100644 --- a/kicker/kicker/core/userrectsel.cpp +++ b/kicker/kicker/core/userrectsel.cpp @@ -46,7 +46,7 @@ UserRectSel::~UserRectSel() void UserRectSel::mouseReleaseEvent(TQMouseEvent * e) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { tqApp->exit_loop(); } @@ -89,7 +89,7 @@ void UserRectSel::paintCurrent() for (i = 0; i < 4; i++) { _frame[i] = new TQWidget(0, 0, (WFlags)(WStyle_Customize | WStyle_NoBorder | WX11BypassWM)); - _frame[i]->setPaletteBackgroundColor(Qt::black); + _frame[i]->setPaletteBackgroundColor(TQt::black); } for (i = 4; i < 8; i++) { diff --git a/kicker/kicker/core/userrectsel.h b/kicker/kicker/core/userrectsel.h index 564a6d980..dbc4d62be 100644 --- a/kicker/kicker/core/userrectsel.h +++ b/kicker/kicker/core/userrectsel.h @@ -34,7 +34,7 @@ class ShutUpCompiler; class UserRectSel : public TQWidget { - Q_OBJECT + TQ_OBJECT public: class PanelStrut diff --git a/kicker/kicker/core/usersizesel.cpp b/kicker/kicker/core/usersizesel.cpp index 107a2527a..654114d90 100644 --- a/kicker/kicker/core/usersizesel.cpp +++ b/kicker/kicker/core/usersizesel.cpp @@ -46,7 +46,7 @@ UserSizeSel::UserSizeSel(const TQRect& rect, const KPanelExtension::Position pos } if ((pos == KPanelExtension::Top) || (pos == KPanelExtension::Bottom)) { - setCursor(tqsizeVerCursor); + setCursor(TQt::sizeVerCursor); } setGeometry(-10, -10, 2, 2); @@ -69,7 +69,7 @@ UserSizeSel::~UserSizeSel() void UserSizeSel::mouseReleaseEvent(TQMouseEvent * e) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { tqApp->exit_loop(); } @@ -156,7 +156,7 @@ void UserSizeSel::paintCurrent() for (i = 0; i < 4; i++) { _frame[i] = new TQWidget(0, 0, (WFlags)(WStyle_Customize | WStyle_NoBorder | WX11BypassWM)); - _frame[i]->setPaletteBackgroundColor(Qt::black); + _frame[i]->setPaletteBackgroundColor(TQt::black); } for (i = 4; i < 8; i++) { diff --git a/kicker/kicker/core/usersizesel.h b/kicker/kicker/core/usersizesel.h index 64c8950bd..658baecf2 100644 --- a/kicker/kicker/core/usersizesel.h +++ b/kicker/kicker/core/usersizesel.h @@ -34,7 +34,7 @@ class ShutUpCompiler; class UserSizeSel : public TQWidget { - Q_OBJECT + TQ_OBJECT public: static TQRect select(const TQRect& rect, const KPanelExtension::Position pos, const TQColor& color); diff --git a/kicker/kicker/interfaces/kickoff-search-plugin.h b/kicker/kicker/interfaces/kickoff-search-plugin.h index e605e27c5..fc733f207 100644 --- a/kicker/kicker/interfaces/kickoff-search-plugin.h +++ b/kicker/kicker/interfaces/kickoff-search-plugin.h @@ -91,7 +91,7 @@ namespace KickoffSearch { class KDE_EXPORT Plugin : public TQObject { - Q_OBJECT + TQ_OBJECT public: Plugin(TQObject *parent, const char* name=0); diff --git a/kicker/kicker/interfaces/kickoffsearchinterface.h b/kicker/kicker/interfaces/kickoffsearchinterface.h index 485e9757c..b8a866c7b 100644 --- a/kicker/kicker/interfaces/kickoffsearchinterface.h +++ b/kicker/kicker/interfaces/kickoffsearchinterface.h @@ -30,7 +30,7 @@ namespace KickoffSearch { class KDE_EXPORT KickoffSearchInterface :public TQObject { - Q_OBJECT + TQ_OBJECT public: KickoffSearchInterface( TQObject* parent, const char* name = 0); diff --git a/kicker/kicker/ui/CMakeLists.txt b/kicker/kicker/ui/CMakeLists.txt index 754288ce9..c773cfe7b 100644 --- a/kicker/kicker/ui/CMakeLists.txt +++ b/kicker/kicker/ui/CMakeLists.txt @@ -20,7 +20,6 @@ include_directories( ${CMAKE_SOURCE_DIR}/kicker/kicker/buttons ${CMAKE_SOURCE_DIR}/tdmlib ${CMAKE_SOURCE_DIR}/libkonq - ${DBUS_TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -56,5 +55,5 @@ set( ${target}_SRCS tde_add_library( ${target} STATIC_PIC AUTOMOC SOURCES ${${target}_SRCS} DEPENDENCIES kicker_core-static - LINK dmctl-static kickoffsearch_interfaces-shared ${DBUS_TQT_LIBRARIES} ${HAL_LIBRARIES} + LINK dmctl-static kickoffsearch_interfaces-shared ${TDEHW_LIBRARIES} ) diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp index 0db6bc352..fb5e3f16d 100644 --- a/kicker/kicker/ui/addapplet.cpp +++ b/kicker/kicker/ui/addapplet.cpp @@ -61,7 +61,7 @@ AppletWidget::AppletWidget(const AppletInfo& info, bool odd, TQWidget *parent) m_odd(odd), m_selected(false) { - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setSelected(m_selected); itemTitle->setText("<h3>" + info.name() + "</h3>"); @@ -84,8 +84,8 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e) { if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if (me->button() & Qt::LeftButton) + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); + if (me->button() & TQt::LeftButton) { m_dragStart = me->pos(); } @@ -97,7 +97,7 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e) if (e->type() == TQEvent::MouseMove) { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); if ((me->pos() - m_dragStart).manhattanLength() > TDEGlobalSettings::dndEventDelay()) { @@ -123,21 +123,21 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e) void AppletWidget::keyPressEvent(TQKeyEvent *e) { - if (e->key() == Qt::Key_Enter || - e->key() == Qt::Key_Return) + if (e->key() == TQt::Key_Enter || + e->key() == TQt::Key_Return) { emit doubleClicked(this); } - else if (e->key() == Qt::Key_Up) + else if (e->key() == TQt::Key_Up) { TQKeyEvent fakedKeyPress(TQEvent::KeyPress, TQt::Key_BackTab, 0, 0); TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_BackTab, 0, 0); TQApplication::sendEvent(this, &fakedKeyPress); TQApplication::sendEvent(this, &fakedKeyRelease); } - else if (e->key() == Qt::Key_Down) + else if (e->key() == TQt::Key_Down) { - TQKeyEvent fakedKeyPress(TQEvent::KeyPress, Qt::Key_Tab, 0, 0); + TQKeyEvent fakedKeyPress(TQEvent::KeyPress, TQt::Key_Tab, 0, 0); TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_Escape, 0, 0); TQApplication::sendEvent(this, &fakedKeyPress); TQApplication::sendEvent(this, &fakedKeyRelease); @@ -150,7 +150,7 @@ void AppletWidget::keyPressEvent(TQKeyEvent *e) void AppletWidget::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { emit clicked(this); m_dragStart = e->pos(); @@ -162,7 +162,7 @@ void AppletWidget::mousePressEvent(TQMouseEvent *e) void AppletWidget::mouseMoveEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton && + if (e->button() == TQt::LeftButton && !m_dragStart.isNull() && (e->pos() - m_dragStart).manhattanLength() > TDEGlobalSettings::dndEventDelay()) @@ -186,7 +186,7 @@ void AppletWidget::mouseReleaseEvent(TQMouseEvent *e) void AppletWidget::mouseDoubleClickEvent(TQMouseEvent *e) { - if (!e->button() == Qt::LeftButton) + if (!e->button() == TQt::LeftButton) { AppletItem::mouseDoubleClickEvent(e); return; @@ -254,16 +254,16 @@ AddAppletDialog::AddAppletDialog(ContainerArea* cArea, m_mainWidget->appletInstall->setGuiItem(addGuiItem); m_mainWidget->closeButton->setGuiItem(KStdGuiItem::close()); - connect(m_mainWidget->appletSearch, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(delayedSearch())); - connect(m_searchDelay, TQT_SIGNAL(timeout()), this, TQT_SLOT(search())); - connect(m_mainWidget->appletFilter, TQT_SIGNAL(activated(int)), this, TQT_SLOT(filter(int))); - connect(m_mainWidget->appletInstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(addCurrentApplet())); - connect(m_mainWidget->closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(close())); + connect(m_mainWidget->appletSearch, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(delayedSearch())); + connect(m_searchDelay, TQ_SIGNAL(timeout()), this, TQ_SLOT(search())); + connect(m_mainWidget->appletFilter, TQ_SIGNAL(activated(int)), this, TQ_SLOT(filter(int))); + connect(m_mainWidget->appletInstall, TQ_SIGNAL(clicked()), this, TQ_SLOT(addCurrentApplet())); + connect(m_mainWidget->closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(close())); m_selectedType = AppletInfo::Undefined; m_appletBox = 0; - TQTimer::singleShot(0, this, TQT_SLOT(populateApplets())); + TQTimer::singleShot(0, this, TQ_SLOT(populateApplets())); } void AddAppletDialog::updateInsertionPoint() @@ -303,9 +303,9 @@ void AddAppletDialog::resizeAppletView() bool AddAppletDialog::eventFilter(TQObject *o, TQEvent *e) { if (e->type() == TQEvent::Resize) - TQTimer::singleShot(0, this, TQT_SLOT(resizeAppletView())); + TQTimer::singleShot(0, this, TQ_SLOT(resizeAppletView())); - return TQT_TQOBJECT(this)->TQObject::eventFilter(o, e); + return this->TQObject::eventFilter(o, e); } void AddAppletDialog::populateApplets() @@ -372,10 +372,10 @@ void AddAppletDialog::populateApplets() setTabOrder(prevTabWidget, itemWidget); prevTabWidget = itemWidget; - connect(itemWidget, TQT_SIGNAL(clicked(AppletWidget*)), - this, TQT_SLOT(selectApplet(AppletWidget*))); - connect(itemWidget, TQT_SIGNAL(doubleClicked(AppletWidget*)), - this, TQT_SLOT(addApplet(AppletWidget*))); + connect(itemWidget, TQ_SIGNAL(clicked(AppletWidget*)), + this, TQ_SLOT(selectApplet(AppletWidget*))); + connect(itemWidget, TQ_SIGNAL(doubleClicked(AppletWidget*)), + this, TQ_SLOT(addApplet(AppletWidget*))); if (m_closing) { @@ -518,7 +518,7 @@ void AddAppletDialog::search() } } - TQTimer::singleShot(0, this, TQT_SLOT(resizeAppletView())); + TQTimer::singleShot(0, this, TQ_SLOT(resizeAppletView())); } void AddAppletDialog::filter(int i) diff --git a/kicker/kicker/ui/addapplet.h b/kicker/kicker/ui/addapplet.h index bc2763f0b..c62b2b2ec 100644 --- a/kicker/kicker/ui/addapplet.h +++ b/kicker/kicker/ui/addapplet.h @@ -41,7 +41,7 @@ class TQTimer; class AddAppletDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: AddAppletDialog(ContainerArea* cArea, TQWidget* parent, const char* name); diff --git a/kicker/kicker/ui/addapplet_mnu.cpp b/kicker/kicker/ui/addapplet_mnu.cpp index 6d5c4482f..f68159b98 100644 --- a/kicker/kicker/ui/addapplet_mnu.cpp +++ b/kicker/kicker/ui/addapplet_mnu.cpp @@ -33,8 +33,8 @@ PanelAddAppletMenu::PanelAddAppletMenu(ContainerArea* cArea, TQWidget *parent, c : TQPopupMenu(parent, name), containerArea(cArea) { setCheckable(true); - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); - connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); } void PanelAddAppletMenu::slotAboutToShow() diff --git a/kicker/kicker/ui/addapplet_mnu.h b/kicker/kicker/ui/addapplet_mnu.h index 79c539687..dfe15bbeb 100644 --- a/kicker/kicker/ui/addapplet_mnu.h +++ b/kicker/kicker/ui/addapplet_mnu.h @@ -33,7 +33,7 @@ class ContainerArea; class PanelAddAppletMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: PanelAddAppletMenu(ContainerArea *cArea, TQWidget *parent=0, const char *name=0); diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp index 62ff12675..dd6f04135 100644 --- a/kicker/kicker/ui/addappletvisualfeedback.cpp +++ b/kicker/kicker/ui/addappletvisualfeedback.cpp @@ -54,9 +54,9 @@ AddAppletVisualFeedback::AddAppletVisualFeedback(AppletWidget* widget, m_moveTimer(0, "m_moveTimer"), m_dirty(false) { - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setBackgroundMode(NoBackground); - connect(&m_moveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(swoopCloser())); + connect(&m_moveTimer, TQ_SIGNAL(timeout()), TQ_SLOT(swoopCloser())); TQString m = "<qt><h3>" + i18n("%1 Added").arg(widget->info().name()); @@ -109,10 +109,10 @@ void AddAppletVisualFeedback::makeMask() { TQPainter maskPainter(&m_mask); - m_mask.fill(Qt::black); + m_mask.fill(TQt::black); - maskPainter.setBrush(Qt::white); - maskPainter.setPen(Qt::white); + maskPainter.setBrush(TQt::white); + maskPainter.setPen(TQt::white); maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height()); setMask(m_mask); @@ -156,7 +156,7 @@ void AddAppletVisualFeedback::displayInternal() // draw background TQPainter bufferPainter(&m_pixmap); - bufferPainter.setPen(Qt::black); + bufferPainter.setPen(TQt::black); bufferPainter.setBrush(colorGroup().background()); bufferPainter.drawRoundRect(0, 0, width, height, 1600 / width, 1600 / height); @@ -218,7 +218,7 @@ void AddAppletVisualFeedback::swoopCloser() { m_moveTimer.stop(); displayInternal(); - TQTimer::singleShot(2000, this, TQT_SLOT(deleteLater())); + TQTimer::singleShot(2000, this, TQ_SLOT(deleteLater())); } } diff --git a/kicker/kicker/ui/addappletvisualfeedback.h b/kicker/kicker/ui/addappletvisualfeedback.h index dc660bff1..d2e3da5e6 100644 --- a/kicker/kicker/ui/addappletvisualfeedback.h +++ b/kicker/kicker/ui/addappletvisualfeedback.h @@ -40,7 +40,7 @@ class TQTimer; class AddAppletVisualFeedback : TQWidget { - Q_OBJECT + TQ_OBJECT public: AddAppletVisualFeedback(AppletWidget* parent, diff --git a/kicker/kicker/ui/addbutton_mnu.h b/kicker/kicker/ui/addbutton_mnu.h index 209e7e9a3..1a19b9480 100644 --- a/kicker/kicker/ui/addbutton_mnu.h +++ b/kicker/kicker/ui/addbutton_mnu.h @@ -30,7 +30,7 @@ class ContainerArea; class PanelAddButtonMenu : public PanelServiceMenu { - Q_OBJECT + TQ_OBJECT public: PanelAddButtonMenu(ContainerArea* cArea, const TQString & label, const TQString & relPath, diff --git a/kicker/kicker/ui/addextension_mnu.cpp b/kicker/kicker/ui/addextension_mnu.cpp index b22187443..c0eda09ab 100644 --- a/kicker/kicker/ui/addextension_mnu.cpp +++ b/kicker/kicker/ui/addextension_mnu.cpp @@ -31,8 +31,8 @@ PanelAddExtensionMenu::PanelAddExtensionMenu(TQWidget *parent, const char *name) : TQPopupMenu(parent, name) { setCheckable(true); - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); - connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); } void PanelAddExtensionMenu::slotAboutToShow() diff --git a/kicker/kicker/ui/addextension_mnu.h b/kicker/kicker/ui/addextension_mnu.h index 76163250f..f3be54c1f 100644 --- a/kicker/kicker/ui/addextension_mnu.h +++ b/kicker/kicker/ui/addextension_mnu.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class PanelAddExtensionMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: PanelAddExtensionMenu(TQWidget *parent=0, const char *name=0); diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp index a037909b6..740260d7f 100644 --- a/kicker/kicker/ui/appletop_mnu.cpp +++ b/kicker/kicker/ui/appletop_mnu.cpp @@ -169,10 +169,10 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP } if (KickerSettings::legacyKMenu()) -// insertItem(SmallIcon("kickoff"), i18n("Switch to Kickoff Menu Style"), this, TQT_SLOT(toggleLegacy())); - insertItem(SmallIcon("launch"), i18n("Switch to Kickoff Menu Style"), this, TQT_SLOT(toggleLegacy())); +// insertItem(SmallIcon("kickoff"), i18n("Switch to Kickoff Menu Style"), this, TQ_SLOT(toggleLegacy())); + insertItem(SmallIcon("launch"), i18n("Switch to Kickoff Menu Style"), this, TQ_SLOT(toggleLegacy())); else - insertItem(SmallIcon("about_kde"), i18n("Switch to Trinity Classic Menu Style"), this, TQT_SLOT(toggleLegacy())); + insertItem(SmallIcon("about_kde"), i18n("Switch to Trinity Classic Menu Style"), this, TQ_SLOT(toggleLegacy())); } if ((actions & PanelAppletOpMenu::KMenuEditor) && kapp->authorizeTDEAction("menuedit")) @@ -213,7 +213,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP void PanelAppletOpMenu::keyPressEvent(TQKeyEvent* e) { - if (e->key() == Qt::Key_Escape) + if (e->key() == TQt::Key_Escape) { emit escapePressed(); } diff --git a/kicker/kicker/ui/appletop_mnu.h b/kicker/kicker/ui/appletop_mnu.h index 35e10be3c..ae058cea1 100644 --- a/kicker/kicker/ui/appletop_mnu.h +++ b/kicker/kicker/ui/appletop_mnu.h @@ -31,7 +31,7 @@ class AppletInfo; // The button operations menu (usually right click) class PanelAppletOpMenu : public TQPopupMenu { -Q_OBJECT +TQ_OBJECT public: enum OpButton{Move = 9900, Remove = 9901, Help = 9902, About = 9903, Preferences = 9904, ReportBug = 9905 }; diff --git a/kicker/kicker/ui/appletview.ui b/kicker/kicker/ui/appletview.ui index 5d92dab89..e61575a72 100644 --- a/kicker/kicker/ui/appletview.ui +++ b/kicker/kicker/ui/appletview.ui @@ -198,8 +198,6 @@ <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tqscrollview.h</include> </includes> -<includehints> - <includehint>tqscrollview.h</includehint> -</includehints> </UI> diff --git a/kicker/kicker/ui/appletwidget.h b/kicker/kicker/ui/appletwidget.h index d0bb9e885..e0a0b485c 100644 --- a/kicker/kicker/ui/appletwidget.h +++ b/kicker/kicker/ui/appletwidget.h @@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class AppletWidget: public AppletItem { - Q_OBJECT + TQ_OBJECT public: typedef TQValueList<AppletWidget*> List; diff --git a/kicker/kicker/ui/browser_dlg.cpp b/kicker/kicker/ui/browser_dlg.cpp index 0e98054d8..27eb0def5 100644 --- a/kicker/kicker/ui/browser_dlg.cpp +++ b/kicker/kicker/ui/browser_dlg.cpp @@ -55,7 +55,7 @@ PanelBrowserDialog::PanelBrowserDialog( const TQString& path, const TQString &ic hbox1->setSpacing( KDialog::spacingHint() ); TQLabel *label2 = new TQLabel( i18n ( "Path:" ), hbox1 ); pathInput = new KLineEdit( hbox1 ); - connect( pathInput, TQT_SIGNAL( textChanged ( const TQString & )), this, TQT_SLOT( slotPathChanged( const TQString & ))); + connect( pathInput, TQ_SIGNAL( textChanged ( const TQString & )), this, TQ_SLOT( slotPathChanged( const TQString & ))); pathInput->setText( path ); pathInput->setFocus(); @@ -69,7 +69,7 @@ PanelBrowserDialog::PanelBrowserDialog( const TQString& path, const TQString &ic else iconBtn->setIcon( icon ); - connect( browseBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( browse() ) ); + connect( browseBtn, TQ_SIGNAL( clicked() ), this, TQ_SLOT( browse() ) ); } PanelBrowserDialog::~PanelBrowserDialog() diff --git a/kicker/kicker/ui/browser_dlg.h b/kicker/kicker/ui/browser_dlg.h index d1b3b623d..8aad531a2 100644 --- a/kicker/kicker/ui/browser_dlg.h +++ b/kicker/kicker/ui/browser_dlg.h @@ -31,7 +31,7 @@ class KLineEdit; class PanelBrowserDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: PanelBrowserDialog( const TQString &path = TQString::null, const TQString &icon = TQString::null, TQWidget *parent = 0, const char *name = 0 ); diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp index c5b76569c..63ea58f1b 100644 --- a/kicker/kicker/ui/browser_mnu.cpp +++ b/kicker/kicker/ui/browser_mnu.cpp @@ -64,12 +64,12 @@ PanelBrowserMenu::PanelBrowserMenu(TQString path, TQWidget *parent, const char * // we are not interested for dirty events on files inside the // directory (see slotClearIfNeeded) - connect( &_dirWatch, TQT_SIGNAL(dirty(const TQString&)), - this, TQT_SLOT(slotClearIfNeeded(const TQString&)) ); - connect( &_dirWatch, TQT_SIGNAL(created(const TQString&)), - this, TQT_SLOT(slotClear()) ); - connect( &_dirWatch, TQT_SIGNAL(deleted(const TQString&)), - this, TQT_SLOT(slotClear()) ); + connect( &_dirWatch, TQ_SIGNAL(dirty(const TQString&)), + this, TQ_SLOT(slotClearIfNeeded(const TQString&)) ); + connect( &_dirWatch, TQ_SIGNAL(created(const TQString&)), + this, TQ_SLOT(slotClear()) ); + connect( &_dirWatch, TQ_SIGNAL(deleted(const TQString&)), + this, TQ_SLOT(slotClear()) ); kdDebug() << "PanelBrowserMenu Constructor " << path << endl; } @@ -151,9 +151,9 @@ void PanelBrowserMenu::initialize() insertTitle(path()); TDEConfig *c = TDEGlobal::config(); c->setGroup("menus"); - insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQT_SLOT(slotOpenFileManager())); + insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQ_SLOT(slotOpenFileManager())); if (kapp->authorize("shell_access") && KickerSettings::showOpenInTerminal()) - insertItem(CICON("terminal"), i18n("Open in Terminal"), this, TQT_SLOT(slotOpenTerminal())); + insertItem(CICON("terminal"), i18n("Open in Terminal"), this, TQ_SLOT(slotOpenTerminal())); insertSeparator(); } @@ -334,7 +334,7 @@ void PanelBrowserMenu::initialize() if(!_mimecheckTimer) _mimecheckTimer = new TQTimer(this, "_mimecheckTimer"); - connect(_mimecheckTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotMimeCheck())); + connect(_mimecheckTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotMimeCheck())); _mimecheckTimer->start(0); } } @@ -380,7 +380,7 @@ void PanelBrowserMenu::mouseMoveEvent(TQMouseEvent *e) { TQPopupMenu::mouseMoveEvent(e); - if (!(e->state() & Qt::LeftButton)) return; + if (!(e->state() & TQt::LeftButton)) return; if(_lastpress == TQPoint(-1, -1)) return; // DND delay @@ -398,7 +398,7 @@ void PanelBrowserMenu::mouseMoveEvent(TQMouseEvent *e) url.setPath(path() + "/" + _filemap[id]); KURL::List files(url); KURLDrag *d = new KURLDrag(files, this); - connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDragObjectDestroyed())); + connect(d, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDragObjectDestroyed())); d->setPixmap(iconSet(id)->pixmap()); d->drag(); } @@ -422,7 +422,7 @@ void PanelBrowserMenu::dragEnterEvent( TQDragEnterEvent *ev ) void PanelBrowserMenu::dragMoveEvent(TQDragMoveEvent *ev) { - TQMouseEvent mev(TQEvent::MouseMove, ev->pos(), Qt::NoButton, Qt::LeftButton); + TQMouseEvent mev(TQEvent::MouseMove, ev->pos(), TQt::NoButton, TQt::LeftButton); TQPopupMenu::mouseMoveEvent(&mev); } diff --git a/kicker/kicker/ui/browser_mnu.h b/kicker/kicker/ui/browser_mnu.h index 38f9b9690..1359e855e 100644 --- a/kicker/kicker/ui/browser_mnu.h +++ b/kicker/kicker/ui/browser_mnu.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class PanelBrowserMenu : public KPanelMenu { - Q_OBJECT + TQ_OBJECT public: PanelBrowserMenu(TQString path, TQWidget *parent = 0, const char *name = 0, int startid = 0); diff --git a/kicker/kicker/ui/clicklineedit.h b/kicker/kicker/ui/clicklineedit.h index 85efcada8..22dc8f904 100644 --- a/kicker/kicker/ui/clicklineedit.h +++ b/kicker/kicker/ui/clicklineedit.h @@ -35,7 +35,7 @@ namespace KPIM { */ class KDE_EXPORT ClickLineEdit : public KLineEdit { - Q_OBJECT + TQ_OBJECT public: ClickLineEdit( TQWidget *parent, const TQString &msg = TQString::null, const char* name = 0 ); ~ClickLineEdit(); diff --git a/kicker/kicker/ui/client_mnu.cpp b/kicker/kicker/ui/client_mnu.cpp index 0ad2107d1..8a69f0749 100644 --- a/kicker/kicker/ui/client_mnu.cpp +++ b/kicker/kicker/ui/client_mnu.cpp @@ -46,13 +46,13 @@ void KickerClientMenu::clear() void KickerClientMenu::insertItem( TQPixmap icon, TQString text, int id ) { - int globalid = TQPopupMenu::insertItem( icon, text, this, TQT_SLOT( slotActivated(int) ) ); + int globalid = TQPopupMenu::insertItem( icon, text, this, TQ_SLOT( slotActivated(int) ) ); setItemParameter( globalid, id ); } void KickerClientMenu::insertItem( TQString text, int id ) { - int globalid = TQPopupMenu::insertItem( text, this, TQT_SLOT( slotActivated(int) ) ); + int globalid = TQPopupMenu::insertItem( text, this, TQ_SLOT( slotActivated(int) ) ); setItemParameter( globalid, id ); } diff --git a/kicker/kicker/ui/client_mnu.h b/kicker/kicker/ui/client_mnu.h index 272f6364f..c1884469d 100644 --- a/kicker/kicker/ui/client_mnu.h +++ b/kicker/kicker/ui/client_mnu.h @@ -40,7 +40,7 @@ class PanelKMenu; */ class KickerClientMenu : public TQPopupMenu, DCOPObject { - Q_OBJECT + TQ_OBJECT public: KickerClientMenu( TQWidget *parent=0, const char *name=0); ~KickerClientMenu(); diff --git a/kicker/kicker/ui/exe_dlg.cpp b/kicker/kicker/ui/exe_dlg.cpp index 07caa2b55..6861ba988 100644 --- a/kicker/kicker/ui/exe_dlg.cpp +++ b/kicker/kicker/ui/exe_dlg.cpp @@ -68,14 +68,14 @@ PanelExeDialog::PanelExeDialog(const TQString& title, const TQString& descriptio updateIcon(); - connect(ui->m_exec, TQT_SIGNAL(urlSelected(const TQString &)), - this, TQT_SLOT(slotSelect(const TQString &))); - connect(ui->m_exec, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotTextChanged(const TQString &))); - connect(ui->m_exec, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(slotReturnPressed())); - connect(ui->m_icon, TQT_SIGNAL(iconChanged(TQString)), - this, TQT_SLOT(slotIconChanged(TQString))); + connect(ui->m_exec, TQ_SIGNAL(urlSelected(const TQString &)), + this, TQ_SLOT(slotSelect(const TQString &))); + connect(ui->m_exec, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotTextChanged(const TQString &))); + connect(ui->m_exec, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(slotReturnPressed())); + connect(ui->m_icon, TQ_SIGNAL(iconChanged(TQString)), + this, TQ_SLOT(slotIconChanged(TQString))); // leave decent space for the commandline resize(sizeHint().width() > 300 ? sizeHint().width() : 300, diff --git a/kicker/kicker/ui/exe_dlg.h b/kicker/kicker/ui/exe_dlg.h index ef96fe9d0..669e98a61 100644 --- a/kicker/kicker/ui/exe_dlg.h +++ b/kicker/kicker/ui/exe_dlg.h @@ -29,7 +29,7 @@ class NonKDEButtonSettings; class PanelExeDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: PanelExeDialog(const TQString& title, const TQString& description, const TQString &path, const TQString &pixmap=TQString::null, diff --git a/kicker/kicker/ui/flipscrollview.cpp b/kicker/kicker/ui/flipscrollview.cpp index ae96ebcaa..e2e19d406 100644 --- a/kicker/kicker/ui/flipscrollview.cpp +++ b/kicker/kicker/ui/flipscrollview.cpp @@ -101,20 +101,20 @@ FlipScrollView::FlipScrollView( TQWidget * parent, const char * name ) addChild( mRightView ); mTimer = new TQTimer( this, "mTimer" ); - connect( mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotScrollTimer() ) ); - - connect( mLeftView, TQT_SIGNAL( startService(KService::Ptr) ), - TQT_SIGNAL( startService(KService::Ptr) ) ); - connect( mLeftView, TQT_SIGNAL( startURL(const TQString& ) ), - TQT_SIGNAL( startURL(const TQString& ) ) ); - connect( mLeftView, TQT_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ), - TQT_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ) ); - connect( mRightView, TQT_SIGNAL( startService(KService::Ptr) ), - TQT_SIGNAL( startService(KService::Ptr) ) ); - connect( mRightView, TQT_SIGNAL( startURL(const TQString& ) ), - TQT_SIGNAL( startURL(const TQString& ) ) ); - connect( mRightView, TQT_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ), - TQT_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ) ); + connect( mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotScrollTimer() ) ); + + connect( mLeftView, TQ_SIGNAL( startService(KService::Ptr) ), + TQ_SIGNAL( startService(KService::Ptr) ) ); + connect( mLeftView, TQ_SIGNAL( startURL(const TQString& ) ), + TQ_SIGNAL( startURL(const TQString& ) ) ); + connect( mLeftView, TQ_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ), + TQ_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ) ); + connect( mRightView, TQ_SIGNAL( startService(KService::Ptr) ), + TQ_SIGNAL( startService(KService::Ptr) ) ); + connect( mRightView, TQ_SIGNAL( startURL(const TQString& ) ), + TQ_SIGNAL( startURL(const TQString& ) ) ); + connect( mRightView, TQ_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ), + TQ_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ) ); // wild hack to make sure it has correct width mLeftView->setVScrollBarMode( TQScrollView::AlwaysOn ); @@ -124,7 +124,7 @@ FlipScrollView::FlipScrollView( TQWidget * parent, const char * name ) mBackrow = new BackFrame( this ); mBackrow->resize( 24, 100 ); - connect( mBackrow, TQT_SIGNAL( clicked() ), TQT_SIGNAL( backButtonClicked() ) ); + connect( mBackrow, TQ_SIGNAL( clicked() ), TQ_SIGNAL( backButtonClicked() ) ); } ItemView* FlipScrollView::prepareRightMove() diff --git a/kicker/kicker/ui/flipscrollview.h b/kicker/kicker/ui/flipscrollview.h index d2de2ab5e..6ba2615b3 100644 --- a/kicker/kicker/ui/flipscrollview.h +++ b/kicker/kicker/ui/flipscrollview.h @@ -51,7 +51,7 @@ class ItemView; class BackFrame : public TQFrame { - Q_OBJECT + TQ_OBJECT public: BackFrame( TQWidget *parent ); @@ -71,7 +71,7 @@ private: class FlipScrollView : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: enum State{ StoppedLeft, StoppedRight, ScrollingLeft, ScrollingRight }; FlipScrollView( TQWidget * parent = 0, const char * name = 0 ); diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp index 971679359..3107fe17a 100644 --- a/kicker/kicker/ui/hidebutton.cpp +++ b/kicker/kicker/ui/hidebutton.cpp @@ -34,12 +34,12 @@ HideButton::HideButton(TQWidget *parent, const char *name) : TQButton(parent, name), m_highlight(false), - m_arrow(Qt::LeftArrow) + m_arrow(TQt::LeftArrow) { setBackgroundOrigin(AncestorOrigin); - connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); - connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(slotIconChanged(int))); + connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); + connect(kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int))); kapp->addKipcEventMask(KIPC::SettingsChanged); kapp->addKipcEventMask(KIPC::IconChanged); @@ -49,22 +49,22 @@ HideButton::HideButton(TQWidget *parent, const char *name) void HideButton::drawButton(TQPainter *p) { - if (m_arrow == Qt::LeftArrow) + if (m_arrow == TQt::LeftArrow) { p->setPen(colorGroup().mid()); p->drawLine(width()-1, 0, width()-1, height()); } - else if (m_arrow == Qt::RightArrow) + else if (m_arrow == TQt::RightArrow) { p->setPen(colorGroup().mid()); p->drawLine(0, 0, 0, height()); } - else if (m_arrow == Qt::UpArrow) + else if (m_arrow == TQt::UpArrow) { p->setPen(colorGroup().mid()); p->drawLine(0, height()-1, width(), height()-1); } - else if (m_arrow == Qt::DownArrow) + else if (m_arrow == TQt::DownArrow) { p->setPen(colorGroup().mid()); p->drawLine(0, 0, width(), 0); @@ -106,24 +106,24 @@ void HideButton::setPixmap(const TQPixmap &pix) generateIcons(); } -void HideButton::setArrowType(Qt::ArrowType arrow) +void HideButton::setArrowType(TQt::ArrowType arrow) { m_arrow = arrow; switch (arrow) { - case Qt::LeftArrow: + case TQt::LeftArrow: setPixmap(SmallIcon("1leftarrow")); break; - case Qt::RightArrow: + case TQt::RightArrow: setPixmap(SmallIcon("1rightarrow")); break; - case Qt::UpArrow: + case TQt::UpArrow: setPixmap(SmallIcon("1uparrow")); break; - case Qt::DownArrow: + case TQt::DownArrow: default: setPixmap(SmallIcon("1downarrow")); break; @@ -138,7 +138,7 @@ void HideButton::generateIcons() } TQImage image = pixmap()->convertToImage(); - image = image.smoothScale(size() - TQSize(4, 4), TQ_ScaleMin); + image = image.smoothScale(size() - TQSize(4, 4), TQImage::ScaleMin); TDEIconEffect effect; diff --git a/kicker/kicker/ui/hidebutton.h b/kicker/kicker/ui/hidebutton.h index c73c25ba7..c8c754857 100644 --- a/kicker/kicker/ui/hidebutton.h +++ b/kicker/kicker/ui/hidebutton.h @@ -25,11 +25,11 @@ class HideButton : public TQButton { - Q_OBJECT + TQ_OBJECT public: HideButton(TQWidget *parent, const char *name = 0); - void setArrowType(Qt::ArrowType arrow); + void setArrowType(TQt::ArrowType arrow); void setPixmap(const TQPixmap &pix); protected: @@ -44,7 +44,7 @@ class HideButton : public TQButton bool m_highlight; TQPixmap m_normalIcon; TQPixmap m_activeIcon; - Qt::ArrowType m_arrow; + TQt::ArrowType m_arrow; protected slots: void slotSettingsChanged( int category ); diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp index 4ca9acb81..155584ab9 100644 --- a/kicker/kicker/ui/itemview.cpp +++ b/kicker/kicker/ui/itemview.cpp @@ -158,12 +158,12 @@ void KMenuItem::setup() float min_font_size = 7. * TQMAX(1., TDEGlobalSettings::generalFont().pointSizeFloat() / 10.); const int expected_height = 38; - description_font_size = TQMAX( pointSize( expected_height * .3, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size ) ; - title_font_size = TQMAX( pointSize( expected_height * .25, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ); + description_font_size = TQMAX( pointSize( expected_height * .3, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size ) ; + title_font_size = TQMAX( pointSize( expected_height * .25, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ); //kdDebug() << description_font_size << " " << title_font_size << " " << pointSize( expected_height * .25, listView() ) << endl; TQListViewItem::setup(); - setHeight( (int)TQMAX( expected_height, pixelSize( title_font_size + description_font_size * 2.3, TQT_TQPAINTDEVICE(listView())))); + setHeight( (int)TQMAX( expected_height, pixelSize( title_font_size + description_font_size * 2.3, listView()))); } void KMenuItem::paintCell(TQPainter* p, const TQColorGroup & cg, int column, int width, int align) @@ -278,7 +278,7 @@ void KMenuItem::paintCellInter(TQPainter* p, const TQColorGroup & cg, int column if ( m_description.isEmpty() ) spacing = ( height() - f1h ) / 2; - int right_triangle_size = pixelSize( 7, TQT_TQPAINTDEVICE(listView()) ); + int right_triangle_size = pixelSize( 7, listView() ); int right_margin = listView()->verticalScrollBar()->width(); if ( m_has_children ) @@ -531,7 +531,7 @@ void KMenuItemHeader::paintCell(TQPainter* p, const TQColorGroup & cg, int , int int r = left_margin + margin * 2; const int min_font_size = 7; - int title_font_pixelSize = tqRound( pixelSize( TQMAX( pointSize( 12, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ), TQT_TQPAINTDEVICE(listView()) ) ); + int title_font_pixelSize = tqRound( pixelSize( TQMAX( pointSize( 12, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ), listView() ) ); TQFont f1 = p->font(); f1.setPixelSize( title_font_pixelSize ); @@ -635,16 +635,16 @@ ItemView::ItemView(TQWidget* parent, const char* name) setItemMargin(0); setSorting(-1); setTreeStepSize(38); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); m_lastOne = 0; m_old_contentY = -1; - connect(this, TQT_SIGNAL(mouseButtonClicked( int, TQListViewItem*, const TQPoint &, int )), - TQT_SLOT(slotItemClicked(int, TQListViewItem*, const TQPoint &, int))); + connect(this, TQ_SIGNAL(mouseButtonClicked( int, TQListViewItem*, const TQPoint &, int )), + TQ_SLOT(slotItemClicked(int, TQListViewItem*, const TQPoint &, int))); - connect(this, TQT_SIGNAL(returnPressed(TQListViewItem*)), TQT_SLOT(slotItemClicked(TQListViewItem*))); - connect(this, TQT_SIGNAL(spacePressed(TQListViewItem*)), TQT_SLOT(slotItemClicked(TQListViewItem*))); + connect(this, TQ_SIGNAL(returnPressed(TQListViewItem*)), TQ_SLOT(slotItemClicked(TQListViewItem*))); + connect(this, TQ_SIGNAL(spacePressed(TQListViewItem*)), TQ_SLOT(slotItemClicked(TQListViewItem*))); new ItemViewTip( viewport(), this ); } @@ -944,14 +944,14 @@ void ItemView::contentsMouseMoveEvent(TQMouseEvent *e) if (m_mouseMoveSelects) { if(i && i->isEnabled() && !i->isSelected() && // FIXME: This is wrong if you drag over the items. - (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0) + (e->state() & (TQt::LeftButton|TQt::MidButton|TQt::RightButton)) == 0) TDEListView::setSelected(i, true); else if (!i && selectedItem()) TDEListView::setSelected(selectedItem(), false); } if ( link_cursor ) - setCursor( Qt::PointingHandCursor ); + setCursor( TQt::PointingHandCursor ); else unsetCursor(); @@ -999,7 +999,7 @@ void ItemView::contentsWheelEvent(TQWheelEvent *e) if(i && i->isEnabled() && !i->isSelected() && // FIXME: This is wrong if you drag over the items. - (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0) + (e->state() & (TQt::LeftButton|TQt::MidButton|TQt::RightButton)) == 0) TDEListView::setSelected(i, true); else if (!i && selectedItem()) TDEListView::setSelected(selectedItem(), false); @@ -1029,7 +1029,7 @@ TQDragObject * ItemView::dragObject() mask = *pix.mask(); else { mask.resize(pix.size()); - mask.fill(Qt::color1); + mask.fill(TQt::color1); } bitBlt( &mask, pix.width()-add.width(), pix.height()-add.height(), add.mask(), 0, 0, add.width(), add.height(), OrROP ); diff --git a/kicker/kicker/ui/itemview.h b/kicker/kicker/ui/itemview.h index 27807c939..bab0142c2 100644 --- a/kicker/kicker/ui/itemview.h +++ b/kicker/kicker/ui/itemview.h @@ -156,7 +156,7 @@ class ItemView : public TDEListView { friend class KMenuItem; - Q_OBJECT + TQ_OBJECT public: ItemView(TQWidget* parent, const char* name = 0); diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index 4362e91f1..768056473 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -52,6 +52,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdetoolbarbutton.h> #include <twin.h> #include <popupmenutop.h> +#include <tdeaccel.h> #include "client_mnu.h" #include "container_base.h" @@ -86,8 +87,8 @@ PanelKMenu::PanelKMenu() disableAutoClear(); actionCollection = new TDEActionCollection(this); setCaption(i18n("TDE Menu")); - connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), - this, TQT_SLOT(configChanged())); + connect(Kicker::the(), TQ_SIGNAL(configurationChanged()), + this, TQ_SLOT(configChanged())); DCOPClient *dcopClient = TDEApplication::dcopClient(); dcopClient->connectDCOPSignal(0, "appLauncher", "serviceStartedByStorageId(TQString,TQString)", @@ -95,7 +96,7 @@ PanelKMenu::PanelKMenu() "slotServiceStartedByStorageId(TQString,TQString)", false); displayRepairTimer = new TQTimer( this ); - connect( displayRepairTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(repairDisplay()) ); + connect( displayRepairTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(repairDisplay()) ); } PanelKMenu::~PanelKMenu() @@ -121,15 +122,12 @@ void PanelKMenu::hideMenu() { hide(); -#ifdef USE_QT4 - // The hacks below aren't needed any more because Qt4 supports true transparency for the fading logout screen -#else // USE_QT4 // Try to redraw the area under the menu // Qt makes this surprisingly difficult to do in a timely fashion! while (isShown() == true) kapp->eventLoop()->processEvents(1000); TQTimer *windowtimer = new TQTimer( this ); - connect( windowtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(windowClearTimeout()) ); + connect( windowtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(windowClearTimeout()) ); windowTimerTimedOut = false; windowtimer->start( 0, TRUE ); // Wait for all window system events to be processed while (windowTimerTimedOut == false) @@ -142,12 +140,11 @@ void PanelKMenu::hideMenu() // thereby removing a bad shutdown screen artifact while still providing // a somewhat snappy user interface. TQTimer *delaytimer = new TQTimer( this ); - connect( delaytimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(windowClearTimeout()) ); + connect( delaytimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(windowClearTimeout()) ); windowTimerTimedOut = false; delaytimer->start( 100, TRUE ); // Wait for 100 milliseconds while (windowTimerTimedOut == false) kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000); -#endif // USE_QT4 } void PanelKMenu::windowClearTimeout() @@ -245,13 +242,15 @@ void PanelKMenu::initialize() return; } + TDEAccel *accel = new TDEAccel(this); + if (loadSidePixmap()) { // in case we've been through here before, let's disconnect - disconnect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), - this, TQT_SLOT(paletteChanged())); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), - this, TQT_SLOT(paletteChanged())); + disconnect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), + this, TQ_SLOT(paletteChanged())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), + this, TQ_SLOT(paletteChanged())); } else { @@ -265,14 +264,36 @@ void PanelKMenu::initialize() if (KickerSettings::useSearchBar()) { TQHBox* hbox = new TQHBox( this ); TDEToolBarButton *clearButton = new TDEToolBarButton( "locationbar_erase", 0, hbox ); - searchEdit = new KPIM::ClickLineEdit(hbox, " "+i18n("Press '/' to search...")); - hbox->setFocusPolicy(TQ_StrongFocus); + + TQStringList cuts = TQStringList::split(";", KickerSettings::searchShortcut()); + TQString placeholder; + switch( cuts.count() ) + { + case 0: + placeholder = i18n(" Click here to search..."); + break; + + case 1: + placeholder = i18n(" Press '%1' to search...").arg(cuts[0]); + break; + + case 2: + placeholder = i18n(" Press '%1' or '%2' to search...").arg(cuts[0], cuts[1]); + break; + } + searchEdit = new KPIM::ClickLineEdit( hbox, placeholder ); + + hbox->setFocusPolicy(TQWidget::StrongFocus); hbox->setFocusProxy(searchEdit); hbox->setSpacing( 3 ); - connect(clearButton, TQT_SIGNAL(clicked()), searchEdit, TQT_SLOT(clear())); - connect(this, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotClearSearch())); - connect(searchEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT( slotUpdateSearch( const TQString&))); + connect(clearButton, TQ_SIGNAL(clicked()), searchEdit, TQ_SLOT(clear())); + connect(this, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(slotClearSearch())); + connect(searchEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT( slotUpdateSearch( const TQString&))); + accel->insert("search", i18n("Search"), i18n("TDE Menu search"), + TDEShortcut(KickerSettings::searchShortcut()), + this, TQ_SLOT(slotFocusSearch())); + insertItem(hbox, searchLineID, 0); } else { searchEdit = NULL; @@ -369,7 +390,7 @@ void PanelKMenu::initialize() insertItem(KickerLib::menuIconSet("system-run"), i18n("Run Command..."), this, - TQT_SLOT( slotRunCommand())); + TQ_SLOT( slotRunCommand())); insertSeparator(); } @@ -377,8 +398,8 @@ void PanelKMenu::initialize() { sessionsMenu = new TQPopupMenu( this ); insertItem(KickerLib::menuIconSet("switchuser"), i18n("Switch User"), sessionsMenu); - connect( sessionsMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotPopulateSessions()) ); - connect( sessionsMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSessionActivated(int)) ); + connect( sessionsMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotPopulateSessions()) ); + connect( sessionsMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSessionActivated(int)) ); } /* @@ -388,17 +409,17 @@ void PanelKMenu::initialize() ksmserver.setGroup("General"); if (ksmserver.readEntry( "loginMode" ) == "restoreSavedSession") { - insertItem(KickerLib::menuIconSet("document-save"), i18n("Save Session"), this, TQT_SLOT(slotSaveSession())); + insertItem(KickerLib::menuIconSet("document-save"), i18n("Save Session"), this, TQ_SLOT(slotSaveSession())); } if (kapp->authorize("lock_screen")) { - insertItem(KickerLib::menuIconSet("system-lock-screen"), i18n("Lock Session"), this, TQT_SLOT(slotLock())); + insertItem(KickerLib::menuIconSet("system-lock-screen"), i18n("Lock Session"), this, TQ_SLOT(slotLock())); } if (kapp->authorize("logout")) { - insertItem(KickerLib::menuIconSet("system-log-out"), i18n("Log Out..."), this, TQT_SLOT(slotLogout())); + insertItem(KickerLib::menuIconSet("system-log-out"), i18n("Log Out..."), this, TQ_SLOT(slotLogout())); } #if 0 @@ -507,7 +528,7 @@ void PanelKMenu::slotSessionActivated( int ent ) void PanelKMenu::doNewSession( bool lock ) { int result = KMessageBox::warningContinueCancel( - TQT_TQWIDGET(kapp->desktop()->screen(kapp->desktop()->screenNumber(this))), + kapp->desktop()->screen(kapp->desktop()->screenNumber(this)), i18n("<p>You have chosen to open another desktop session.<br>" "The current session will be hidden " "and a new login screen will be displayed.<br>" @@ -634,7 +655,7 @@ void PanelKMenu::paintEvent(TQPaintEvent * e) TQPainter p(this); p.setClipRegion(e->region()); - style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, + style().drawPrimitive( TQStyle::PE_PanelPopup, &p, TQRect( 0, 0, width(), height() ), colorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0 ) ); @@ -705,7 +726,14 @@ void PanelKMenu::slotUpdateSearch(const TQString& searchString) void PanelKMenu::slotClearSearch() { if (searchEdit && searchEdit->text().isEmpty() == false) { - TQTimer::singleShot(0, searchEdit, TQT_SLOT(clear())); + TQTimer::singleShot(0, searchEdit, TQ_SLOT(clear())); + } +} + +void PanelKMenu::slotFocusSearch() +{ + if (indexOf(searchLineID) >=0 ) { + setActiveItem(indexOf(searchLineID)); } } @@ -719,12 +747,8 @@ void PanelKMenu::keyPressEvent(TQKeyEvent* e) // we follow konqueror. if (!searchEdit) return KPanelMenu::keyPressEvent(e); - if (e->key() == TQt::Key_Slash && !searchEdit->hasFocus()) { - if (indexOf(searchLineID) >=0 ) { - setActiveItem(indexOf(searchLineID)); - } - } - else if (e->key() == TQt::Key_Escape && searchEdit->text().isEmpty() == false) { + + if (e->key() == TQt::Key_Escape && searchEdit->text().isEmpty() == false) { searchEdit->clear(); } else if (e->key() == TQt::Key_Delete && !searchEdit->hasFocus() && diff --git a/kicker/kicker/ui/k_mnu.h b/kicker/kicker/ui/k_mnu.h index 7c76f55ed..bb2056590 100644 --- a/kicker/kicker/ui/k_mnu.h +++ b/kicker/kicker/ui/k_mnu.h @@ -45,7 +45,7 @@ class Panel; class PanelKMenu : public PanelServiceMenu, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP k_dcop: @@ -83,6 +83,7 @@ protected slots: void slotEditUserContact(); void slotUpdateSearch(const TQString &searchtext); void slotClearSearch(); + void slotFocusSearch(); void paletteChanged(); virtual void configChanged(); void updateRecent(); diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index 8ea8e07ca..834086f33 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -21,12 +21,21 @@ ******************************************************************/ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdlib.h> #include <sys/types.h> #include <unistd.h> #include <dmctl.h> #include <inttypes.h> +#ifdef Q_OS_SOLARIS +#include <sys/statvfs.h> +#define statfs statvfs +#endif /* Q_OS_SOLARIS */ + #include <tqimage.h> #include <tqpainter.h> #include <tqstyle.h> @@ -52,7 +61,7 @@ #include <kdebug.h> #include <tdeglobal.h> #include <tdeglobalsettings.h> -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include <tdehardwaredevices.h> #endif #include <kiconloader.h> @@ -112,16 +121,6 @@ #include "config.h" -#ifdef COMPILE_HALBACKEND -#ifndef NO_QT3_DBUS_SUPPORT -/* We acknowledge the the dbus API is unstable */ -#define DBUS_API_SUBJECT_TO_CHANGE -#include <dbus/connection.h> -#endif // NO_QT3_DBUS_SUPPORT - -#include <hal/libhal.h> -#endif // COMPILE_HALBACKEND - #ifdef __NetBSD__ #define statfs statvfs #endif @@ -207,15 +206,15 @@ KMenu::KMenu() m_iconName(TQString()), m_orientation(UnDetermined), m_search_plugin( 0 ) { setMouseTracking(true); - connect(&m_sloppyTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotSloppyTimeout())); + connect(&m_sloppyTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotSloppyTimeout())); // set the first client id to some arbitrarily large value. client_id = 10000; // Don't automatically clear the main menu. actionCollection = new TDEActionCollection(this); - connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), - this, TQT_SLOT(configChanged())); + connect(Kicker::the(), TQ_SIGNAL(configurationChanged()), + this, TQ_SLOT(configChanged())); KUser * user = new KUser(); @@ -229,7 +228,7 @@ KMenu::KMenu() setupUi(); m_userInfo->setBackgroundMode( PaletteBase ); - TQColor userInfoColor = TQApplication::palette().color( TQPalette::Normal, TQColorGroup::Mid ); + TQColor userInfoColor = TQApplication::palette().color( TQPalette::Active, TQColorGroup::Mid ); if ( tqGray( userInfoColor.rgb() ) > 120 ) userInfoColor = userInfoColor.dark( 200 ); else @@ -237,7 +236,7 @@ KMenu::KMenu() m_userInfo->setPaletteForegroundColor( userInfoColor ); m_tabBar = new KickoffTabBar(this, "m_tabBar"); - connect(m_tabBar, TQT_SIGNAL(tabClicked(TQTab*)), TQT_SLOT(tabClicked(TQTab*))); + connect(m_tabBar, TQ_SIGNAL(tabClicked(TQTab*)), TQ_SLOT(tabClicked(TQTab*))); const int tab_icon_size = 32; @@ -285,8 +284,8 @@ KMenu::KMenu() m_tabs[LeaveTab]->setIconSet(BarIcon("leave", tab_icon_size)); } - connect(m_tabBar, TQT_SIGNAL(selected(int)), m_stacker, TQT_SLOT(raiseWidget(int))); - connect(m_stacker, TQT_SIGNAL(aboutToShow(int)), m_tabBar, TQT_SLOT(setCurrentTab(int))); + connect(m_tabBar, TQ_SIGNAL(selected(int)), m_stacker, TQ_SLOT(raiseWidget(int))); + connect(m_stacker, TQ_SIGNAL(aboutToShow(int)), m_tabBar, TQ_SLOT(setCurrentTab(int))); m_favoriteView = new FavoritesItemView (m_stacker, "m_favoriteView"); m_favoriteView->setAcceptDrops(true); @@ -301,11 +300,11 @@ KMenu::KMenu() m_browserView = new FlipScrollView(m_stacker, "m_browserView"); m_stacker->addWidget(m_browserView, ApplicationsTab); - connect( m_browserView, TQT_SIGNAL( backButtonClicked() ), TQT_SLOT( slotGoBack() ) ); + connect( m_browserView, TQ_SIGNAL( backButtonClicked() ), TQ_SLOT( slotGoBack() ) ); m_exitView = new FlipScrollView(m_stacker, "m_exitView"); m_stacker->addWidget(m_exitView, LeaveTab); - connect( m_exitView, TQT_SIGNAL( backButtonClicked() ), TQT_SLOT( slotGoExitMainMenu() ) ); + connect( m_exitView, TQ_SIGNAL( backButtonClicked() ), TQ_SLOT( slotGoExitMainMenu() ) ); m_searchWidget = new TQVBox (m_stacker, "m_searchWidget"); m_searchWidget->setSpacing(0); @@ -332,7 +331,7 @@ KMenu::KMenu() m_searchResultsWidget->setItemMargin(4); // m_searchResultsWidget->setIconSize(16); m_searchActions = new ItemView (m_searchWidget, "m_searchActions"); - m_searchActions->setFocusPolicy(TQ_NoFocus); + m_searchActions->setFocusPolicy(TQWidget::NoFocus); m_searchActions->setItemMargin(4); m_searchInternet = new TQListViewItem(m_searchActions, i18n("Search Internet")); m_searchInternet->setPixmap(0,icon); @@ -342,40 +341,40 @@ KMenu::KMenu() m_searchActions->setMaximumHeight(5+m_searchInternet->height()); - connect(m_searchActions, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(searchActionClicked(TQListViewItem*))); - connect(m_searchActions, TQT_SIGNAL(returnPressed(TQListViewItem*)), TQT_SLOT(searchActionClicked(TQListViewItem*))); - connect(m_searchActions, TQT_SIGNAL(spacePressed(TQListViewItem*)), TQT_SLOT(searchActionClicked(TQListViewItem*))); + connect(m_searchActions, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(searchActionClicked(TQListViewItem*))); + connect(m_searchActions, TQ_SIGNAL(returnPressed(TQListViewItem*)), TQ_SLOT(searchActionClicked(TQListViewItem*))); + connect(m_searchActions, TQ_SIGNAL(spacePressed(TQListViewItem*)), TQ_SLOT(searchActionClicked(TQListViewItem*))); - connect(m_searchResultsWidget, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr))); - connect(m_searchResultsWidget, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&))); - connect(m_searchResultsWidget, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); + connect(m_searchResultsWidget, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr))); + connect(m_searchResultsWidget, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&))); + connect(m_searchResultsWidget, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); - connect(m_recentlyView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr))); - connect(m_recentlyView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&))); - connect(m_recentlyView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); + connect(m_recentlyView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr))); + connect(m_recentlyView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&))); + connect(m_recentlyView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); - connect(m_favoriteView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr))); - connect(m_favoriteView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&))); - connect(m_favoriteView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); - connect(m_favoriteView, TQT_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), TQT_SLOT(slotFavoritesMoved( TQListViewItem*, TQListViewItem*, TQListViewItem* ))); + connect(m_favoriteView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr))); + connect(m_favoriteView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&))); + connect(m_favoriteView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); + connect(m_favoriteView, TQ_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), TQ_SLOT(slotFavoritesMoved( TQListViewItem*, TQListViewItem*, TQListViewItem* ))); - connect(m_systemView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&))); - connect(m_systemView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr))); - connect(m_systemView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); + connect(m_systemView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&))); + connect(m_systemView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr))); + connect(m_systemView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); - connect(m_browserView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotGoSubMenu(const TQString&))); - connect(m_browserView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr))); - connect(m_browserView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); + connect(m_browserView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotGoSubMenu(const TQString&))); + connect(m_browserView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr))); + connect(m_browserView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); - connect(m_exitView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&))); - connect(m_exitView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); + connect(m_exitView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&))); + connect(m_exitView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); m_kcommand->setDuplicatesEnabled( false ); m_kcommand->setLineEdit(new KLineEdit(m_kcommand, "m_kcommand-lineedit")); m_kcommand->setCompletionMode( TDEGlobalSettings::CompletionAuto ); - connect(m_kcommand, TQT_SIGNAL(cleared()), TQT_SLOT(clearedHistory())); - connect(m_kcommand->lineEdit(), TQT_SIGNAL(returnPressed()), TQT_SLOT(searchAccept())); - connect(m_kcommand->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(searchChanged(const TQString &))); + connect(m_kcommand, TQ_SIGNAL(cleared()), TQ_SLOT(clearedHistory())); + connect(m_kcommand->lineEdit(), TQ_SIGNAL(returnPressed()), TQ_SLOT(searchAccept())); + connect(m_kcommand->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(searchChanged(const TQString &))); // URI Filter meta object... m_filterData = new KURIFilterData(); @@ -384,14 +383,14 @@ KMenu::KMenu() categorised_hit_total = new int [num_categories]; input_timer = new TQTimer (this, "input_timer"); - connect( input_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doQuery()) ); + connect( input_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doQuery()) ); init_search_timer = new TQTimer (this, "init_search_timer"); - connect( init_search_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(initSearch()) ); + connect( init_search_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(initSearch()) ); init_search_timer->start(2000, true); - connect( m_favoriteView, TQT_SIGNAL( dropped (TQDropEvent *, TQListViewItem * ) ), - TQT_SLOT( slotFavDropped( TQDropEvent *, TQListViewItem * ) ) ); + connect( m_favoriteView, TQ_SIGNAL( dropped (TQDropEvent *, TQListViewItem * ) ), + TQ_SLOT( slotFavDropped( TQDropEvent *, TQListViewItem * ) ) ); this->installEventFilter(this); m_tabBar->installEventFilter(this); @@ -443,38 +442,6 @@ KMenu::KMenu() search_tab_top_left.load( locate("data", "kicker/pics/search-tab-top-left.png" ) ); search_tab_top_right.load( locate("data", "kicker/pics/search-tab-top-right.png" ) ); search_tab_top_center.load( locate("data", "kicker/pics/search-tab-top-center.png" ) ); - -#ifdef COMPILE_HALBACKEND - m_halCtx = NULL; - m_halCtx = libhal_ctx_new(); - - DBusError error; - dbus_error_init(&error); - m_dbusConn = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error); - if (!m_dbusConn) { - dbus_error_free(&error); - libhal_ctx_free(m_halCtx); - m_halCtx = NULL; - } else { - dbus_bus_register(m_dbusConn, &error); - if (dbus_error_is_set(&error)) { - dbus_error_free(&error); - libhal_ctx_free(m_halCtx); - m_dbusConn = NULL; - m_halCtx = NULL; - } else { - libhal_ctx_set_dbus_connection(m_halCtx, m_dbusConn); - if (!libhal_ctx_init(m_halCtx, &error)) { - if (dbus_error_is_set(&error)) { - dbus_error_free(&error); - } - libhal_ctx_free(m_halCtx); - m_dbusConn = NULL; - m_halCtx = NULL; - } - } - } -#endif } void KMenu::setupUi() @@ -483,10 +450,10 @@ void KMenu::setupUi() 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->setPaletteBackgroundColor( TQColor( 255, 255, 255 ) ); - // m_stacker->setFocusPolicy( TQ_StrongFocus ); + // m_stacker->setFocusPolicy( TQWidget::StrongFocus ); m_stacker->setLineWidth( 0 ); - m_stacker->setFocusPolicy(TQ_NoFocus); - connect(m_stacker, TQT_SIGNAL(aboutToShow(TQWidget*)), TQT_SLOT(stackWidgetRaised(TQWidget*))); + m_stacker->setFocusPolicy(TQWidget::NoFocus); + connect(m_stacker, TQ_SIGNAL(aboutToShow(TQWidget*)), TQ_SLOT(stackWidgetRaised(TQWidget*))); m_kcommand->setName("m_kcommand"); } @@ -497,15 +464,6 @@ KMenu::~KMenu() clearSubmenus(); delete m_filterData; - -#ifdef COMPILE_HALBACKEND - if (m_halCtx) { - DBusError error; - dbus_error_init(&error); - libhal_ctx_shutdown(m_halCtx, &error); - libhal_ctx_free(m_halCtx); - } -#endif } bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) @@ -522,16 +480,16 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) TQPoint p; if (e->type() == TQEvent::MouseMove || e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); p = me->globalPos(); } else if (e->type() == TQEvent::Wheel) { - TQWheelEvent* we = TQT_TQWHEELEVENT(e); + TQWheelEvent* we = static_cast<TQWheelEvent*>(e); p = we->globalPos(); } while (receiver) { - if (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_tabBar) && (e->type()!=TQEvent::MouseMove || KickerSettings::kickoffSwitchTabsOnHover() ) ) { + if (receiver == m_tabBar && (e->type()!=TQEvent::MouseMove || KickerSettings::kickoffSwitchTabsOnHover() ) ) { TQTab* s = m_tabBar->selectTab(m_tabBar->mapFromGlobal(p)); if (s && s->identifier() == ApplicationsTab) raiseWidget = m_browserView; @@ -551,8 +509,8 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) /* we do not want hover activation for the search line edit as this can be * pretty disturbing */ - if ( (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_searchPixmap) || - ( ( TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_searchLabel) || TQT_BASE_OBJECT(receiver)==TQT_BASE_OBJECT(m_kcommand->lineEdit()) ) && + if ( (receiver == m_searchPixmap || + ( ( receiver == m_searchLabel || receiver==m_kcommand->lineEdit() ) && ( e->type() == TQEvent::KeyPress || e->type() == TQEvent::Wheel || e->type() == TQEvent::MouseButtonPress ) ) ) && !m_isShowing) { @@ -564,25 +522,25 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) if(raiseWidget) break; if(receiver->isWidgetType()) - receiver = TQT_TQOBJECT(TQT_TQWIDGET(receiver)->parentWidget(true)); + receiver = static_cast<TQWidget*>(receiver)->parentWidget(true); else break; } if (e->type() == TQEvent::FocusIn && receiver && raiseWidget) { - m_searchResultsWidget->setFocusPolicy(TQ_StrongFocus); + m_searchResultsWidget->setFocusPolicy(TQWidget::StrongFocus); m_searchActions->setFocusPolicy(raiseWidget == m_searchWidget ? - TQ_StrongFocus : TQ_NoFocus); + TQWidget::StrongFocus : TQWidget::NoFocus); setTabOrder(raiseWidget, m_searchResultsWidget); if (raiseWidget != m_stacker->visibleWidget() - && TQT_TQWIDGET(receiver)->focusPolicy() == TQ_NoFocus + && static_cast<TQWidget*>(receiver)->focusPolicy() == TQWidget::NoFocus && m_stacker->id(raiseWidget) >= 0) { m_stacker->raiseWidget(raiseWidget); return true; } - if (raiseWidget->focusPolicy() != TQ_NoFocus) + if (raiseWidget->focusPolicy() != TQWidget::NoFocus) return false; } @@ -604,7 +562,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) } if(e->type() == TQEvent::Enter && receiver->isWidgetType()) { - TQT_TQWIDGET(receiver)->setMouseTracking(true); + static_cast<TQWidget*>(receiver)->setMouseTracking(true); TQToolTip::hide(); } @@ -631,7 +589,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) if (view) { bool handled = true; - switch (TQT_TQKEYEVENT(e)->key()) { + switch (static_cast<TQKeyEvent*>(e)->key()) { case Key_Up: if (view->selectedItem()) { view->setSelected(view->selectedItem()->itemAbove(),true); @@ -708,7 +666,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) r = true; } - if (e->type() == TQEvent::Enter && TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_stacker)) + if (e->type() == TQEvent::Enter && receiver == m_stacker) { TQRect r(m_stacker->mapToGlobal(TQPoint(-8,-32)), m_stacker->size()); r.setSize(r.size()+TQSize(16,128)); @@ -785,8 +743,8 @@ void KMenu::paintSearchTab( bool active ) m_tabBar->deactivateTabs(true); - p.setBrush( Qt::white ); - p.setPen( Qt::NoPen ); + p.setBrush( TQt::white ); + p.setPen( TQt::NoPen ); if ( m_orientation == BottomUp ) { search_tab_center.convertFromImage( search_tab_center.convertToImage().scale(search_tab_center.width(), m_searchFrame->height())); @@ -1267,17 +1225,17 @@ void KMenu::initialize() kdDebug(1210) << "KMenu::initialize()" << endl; // in case we've been through here before, let's disconnect - disconnect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), - this, TQT_SLOT(paletteChanged())); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), - this, TQT_SLOT(paletteChanged())); + disconnect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), + this, TQ_SLOT(paletteChanged())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), + this, TQ_SLOT(paletteChanged())); /* If the user configured ksmserver to */ TDEConfig ksmserver("ksmserverrc", false, false); ksmserver.setGroup("General"); - connect( m_branding, TQT_SIGNAL(clicked()), TQT_SLOT(slotOpenHomepage())); + connect( m_branding, TQ_SIGNAL(clicked()), TQ_SLOT(slotOpenHomepage())); m_tabBar->setTabEnabled(LeaveTab, kapp->authorize("logout")); // load search field history @@ -1374,10 +1332,7 @@ void KMenu::insertStaticExitItems() } bool maysd = false; -#if defined(COMPILE_HALBACKEND) - if (ksmserver.readBoolEntry( "offerShutdown", true ) && DM().canShutdown()) - maysd = true; -#elif defined(__TDE_HAVE_TDEHWLIB) +#if defined(WITH_TDEHWLIB) TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice(); if( rootDevice ) { maysd = rootDevice->canPowerOff(); @@ -1490,11 +1445,11 @@ void KMenu::insertStaticItems() m_systemView->insertItem( "network", i18n( "Network Folders" ), "remote:/", "remote:/", nId++, index++ ); - m_mediaWatcher = new MediaWatcher( TQT_TQOBJECT(this) ); - connect( m_mediaWatcher, TQT_SIGNAL( mediumChanged() ), TQT_SLOT( updateMedia() ) ); + m_mediaWatcher = new MediaWatcher( this ); + connect( m_mediaWatcher, TQ_SIGNAL( mediumChanged() ), TQ_SLOT( updateMedia() ) ); m_media_id = 0; - connect(&m_mediaFreeTimer, TQT_SIGNAL(timeout()), TQT_SLOT( updateMedia())); + connect(&m_mediaFreeTimer, TQ_SIGNAL(timeout()), TQ_SLOT( updateMedia())); } int KMenu::insertClientMenu(KickerClientMenu *) @@ -1579,7 +1534,7 @@ void KMenu::slotSessionActivated( int ent ) void KMenu::doNewSession( bool lock ) { int result = KMessageBox::warningContinueCancel( - TQT_TQWIDGET(kapp->desktop()->screen(kapp->desktop()->screenNumber(this))), + kapp->desktop()->screen(kapp->desktop()->screenNumber(this)), i18n("<p>You have chosen to open another desktop session.<br>" "The current session will be hidden " "and a new login screen will be displayed.<br>" @@ -1797,7 +1752,7 @@ void KMenu::setOrientation(MenuOrientation orientation) m_orientation=orientation; - m_resizeHandle->setCursor(m_orientation == BottomUp ? tqsizeBDiagCursor : tqsizeFDiagCursor); + m_resizeHandle->setCursor(m_orientation == BottomUp ? TQt::sizeBDiagCursor : TQt::sizeFDiagCursor); TQPixmap pix; if ( m_orientation == BottomUp ) @@ -2046,7 +2001,7 @@ void KMenu::createNewProgramList() m_seenPrograms = KickerSettings::firstSeenApps(); m_newInstalledPrograms.clear(); - m_currentDate = TQDate::currentDate().toString(Qt::ISODate); + m_currentDate = TQDate::currentDate().toString(TQt::ISODate); bool initialize = (m_seenPrograms.count() == 0); @@ -2108,7 +2063,7 @@ void KMenu::createNewProgramList(TQString relPath) else { ++it_find; if (*(it_find)!="-") { - TQDate date = TQDate::fromString(*(it_find),Qt::ISODate); + TQDate date = TQDate::fromString(*(it_find),TQt::ISODate); if (date.daysTo(TQDate::currentDate())<3) { if (m_newInstalledPrograms.find(s->storageId())==m_newInstalledPrograms.end()) m_newInstalledPrograms+=s->storageId(); @@ -2328,7 +2283,7 @@ TQString KMenu::insertBreaks(const TQString& text, TQFontMetrics fm, int width, void KMenu::clearSearchResults(bool showHelp) { m_searchResultsWidget->clear(); - m_searchResultsWidget->setFocusPolicy(showHelp ? TQ_NoFocus : TQ_StrongFocus); + m_searchResultsWidget->setFocusPolicy(showHelp ? TQWidget::NoFocus : TQWidget::StrongFocus); setTabOrder(m_kcommand, m_searchResultsWidget); if (showHelp) { @@ -2810,7 +2765,7 @@ void KMenu::slotStartURL(const TQString& u) void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos, int /*col*/ ) { - const TQObject* source = TQT_TQOBJECT_CONST(sender()); + const TQObject* source = sender(); if (!item) return; @@ -2840,12 +2795,12 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos } m_popupMenu = new TDEPopupMenu(this); - connect(m_popupMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContextMenu(int))); + connect(m_popupMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotContextMenu(int))); bool hasEntries = false; m_popupMenu->insertTitle(SmallIcon(kitem->icon()),kitem->title()); - if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_favoriteView)) + if (source==m_favoriteView) { hasEntries = true; m_popupMenu->insertItem(SmallIconSet("remove"), @@ -2877,7 +2832,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos } } - if (TQT_BASE_OBJECT_CONST(source)!=TQT_BASE_OBJECT(m_exitView)) { + if (source!=m_exitView) { if (m_popupService || (!m_popupPath.path.startsWith("kicker:/") && !m_popupPath.path.startsWith("system:/") && !m_popupPath.path.startsWith("kaddressbook:/"))) { if (hasEntries) m_popupMenu->insertSeparator(); @@ -2917,7 +2872,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos i18n("Put Into Run Dialog"), PutIntoRunDialog); } } - if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_searchResultsWidget) || ((TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_favoriteView) || TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_recentlyView) || TQT_BASE_OBJECT_CONST(source) == TQT_BASE_OBJECT(m_systemView)) && !m_popupService && !m_popupPath.path.startsWith("kicker:/")) ) { + if (source==m_searchResultsWidget || ((source==m_favoriteView || source==m_recentlyView || source == m_systemView) && !m_popupService && !m_popupPath.path.startsWith("kicker:/")) ) { TQString uri; if (m_popupService) uri = locate("apps", m_popupService->desktopEntryPath()); @@ -2954,7 +2909,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos } } - if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_recentlyView)) { + if (source==m_recentlyView) { m_popupMenu->insertSeparator(); if (m_popupService) m_popupMenu->insertItem(SmallIconSet("history_clear"), @@ -3024,7 +2979,7 @@ void KMenu::slotContextMenu(int selected) case EditItem: case EditMenu: accept(); - proc = new TDEProcess(TQT_TQOBJECT(this)); + proc = new TDEProcess(this); *proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+m_popupPath.menuPath.section('/',-200,-2) << m_popupPath.menuPath.section('/', -1); proc->start(); @@ -3790,27 +3745,7 @@ void KMenu::insertSuspendOption( int &nId, int &index ) bool standby = false; bool suspend_disk = false; bool hybrid_suspend = false; -#if defined(COMPILE_HALBACKEND) - suspend_ram = libhal_device_get_property_bool(m_halCtx, - "/org/freedesktop/Hal/devices/computer", - "power_management.can_suspend", - NULL); - - standby = libhal_device_get_property_bool(m_halCtx, - "/org/freedesktop/Hal/devices/computer", - "power_management.can_standby", - NULL); - - suspend_disk = libhal_device_get_property_bool(m_halCtx, - "/org/freedesktop/Hal/devices/computer", - "power_management.can_hibernate", - NULL); - - hybrid_suspend = libhal_device_get_property_bool(m_halCtx, - "/org/freedesktop/Hal/devices/computer", - "power_management.can_suspend_hybrid", - NULL); -#elif defined(__TDE_HAVE_TDEHWLIB) // COMPILE_HALBACKEND +#if defined(WITH_TDEHWLIB) TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice(); if (rootDevice) { suspend_ram = rootDevice->canSuspend(); @@ -3882,49 +3817,7 @@ void KMenu::slotSuspend(int id) DCOPRef("kdesktop", "KScreensaverIface").call("lock()"); } -#if defined(COMPILE_HALBACKEND) - DBusMessage* msg = NULL; - - if (m_dbusConn) { - // No Freeze support in HAL - if (id == SuspendType::Standby) { - msg = dbus_message_new_method_call( - "org.freedesktop.Hal", - "/org/freedesktop/Hal/devices/computer", - "org.freedesktop.Hal.Device.SystemPowerManagement", - "Standby"); - } else if (id == SuspendType::Suspend) { - msg = dbus_message_new_method_call( - "org.freedesktop.Hal", - "/org/freedesktop/Hal/devices/computer", - "org.freedesktop.Hal.Device.SystemPowerManagement", - "Suspend"); - int wakeup=0; - dbus_message_append_args(msg, DBUS_TYPE_INT32, &wakeup, DBUS_TYPE_INVALID); - } else if (id == SuspendType::Hibernate) { - msg = dbus_message_new_method_call( - "org.freedesktop.Hal", - "/org/freedesktop/Hal/devices/computer", - "org.freedesktop.Hal.Device.SystemPowerManagement", - "Hibernate"); - } else if (id == SuspendType::HybridSuspend) { - msg = dbus_message_new_method_call( - "org.freedesktop.Hal", - "/org/freedesktop/Hal/devices/computer", - "org.freedesktop.Hal.Device.SystemPowerManagement", - "SuspendHybrid"); - int wakeup=0; - dbus_message_append_args(msg, DBUS_TYPE_INT32, &wakeup, DBUS_TYPE_INVALID); - } else { - return; - } - - if(dbus_connection_send(m_dbusConn, msg, NULL)) { - error = false; - } - dbus_message_unref(msg); - } -#elif defined(__TDE_HAVE_TDEHWLIB) // COMPILE_HALBACKEND +#if defined(WITH_TDEHWLIB) TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice(); if (rootDevice) { if (id == SuspendType::Freeze) { diff --git a/kicker/kicker/ui/k_new_mnu.h b/kicker/kicker/ui/k_new_mnu.h index acb80342b..b0e18e7cb 100644 --- a/kicker/kicker/ui/k_new_mnu.h +++ b/kicker/kicker/ui/k_new_mnu.h @@ -45,16 +45,6 @@ #include <config.h> -#ifdef COMPILE_HALBACKEND -#ifndef NO_QT3_DBUS_SUPPORT -/* We acknowledge the the dbus API is unstable */ -#define DBUS_API_SUBJECT_TO_CHANGE -#include <dbus/connection.h> -#endif // NO_QT3_DBUS_SUPPORT - -#include <hal/libhal.h> -#endif // COMPILE_HALBACKEND - class KickerClientMenu; class KickoffTabBar; class KBookmarkMenu; @@ -88,7 +78,7 @@ enum OverflowCategoryState { None, Filling, NotNeeded }; class KMenu : public KMenuBase { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY (bool TDEStyleMenuDropShadow READ useTDEStyleMenuDropShadow ) public: @@ -347,11 +337,6 @@ private: void fillOverflowCategory(); TQString insertBreaks(const TQString& text, TQFontMetrics fm, int width, TQString leadInsert = TQString::null); - -#ifdef COMPILE_HALBACKEND - LibHalContext* m_halCtx; - DBusConnection *m_dbusConn; -#endif }; #endif diff --git a/kicker/kicker/ui/kickoff_bar.cpp b/kicker/kicker/ui/kickoff_bar.cpp index c13bffe14..977ec1089 100644 --- a/kicker/kicker/ui/kickoff_bar.cpp +++ b/kicker/kicker/ui/kickoff_bar.cpp @@ -199,7 +199,7 @@ void KickoffTabBar::layoutTabs() int w = TQMAX(st.width() / count(), parentWidget()->width() / count()); TQRect r = tab->rect(); - tab->setRect(TQRect(TQPoint(x, 0), style().tqsizeFromContents(TQStyle::CT_TabBarTab, this, + tab->setRect(TQRect(TQPoint(x, 0), style().sizeFromContents(TQStyle::CT_TabBarTab, this, TQSize(w, h), TQStyleOption(tab)))); x += tab->rect().width() - overlap; } @@ -223,7 +223,7 @@ void KickoffTabBar::dragMoveEvent(TQDragMoveEvent* event) void KickoffTabBar::mousePressEvent( TQMouseEvent * e ) { - if ( e->button() != Qt::LeftButton ) { + if ( e->button() != TQt::LeftButton ) { e->ignore(); return; } diff --git a/kicker/kicker/ui/kickoff_bar.h b/kicker/kicker/ui/kickoff_bar.h index 941f1144f..d5dcb8d3c 100644 --- a/kicker/kicker/ui/kickoff_bar.h +++ b/kicker/kicker/ui/kickoff_bar.h @@ -27,7 +27,7 @@ class KickoffTabBar : public TQTabBar { - Q_OBJECT + TQ_OBJECT public: KickoffTabBar(TQWidget* parent, const char* name); diff --git a/kicker/kicker/ui/media_watcher.h b/kicker/kicker/ui/media_watcher.h index 604fcaabe..0f6cb6fae 100644 --- a/kicker/kicker/ui/media_watcher.h +++ b/kicker/kicker/ui/media_watcher.h @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class MediaWatcher : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP TQStringList m_devices; diff --git a/kicker/kicker/ui/mykickoffsearchinterface.h b/kicker/kicker/ui/mykickoffsearchinterface.h index b728718c4..4271766d8 100644 --- a/kicker/kicker/ui/mykickoffsearchinterface.h +++ b/kicker/kicker/ui/mykickoffsearchinterface.h @@ -28,7 +28,7 @@ using namespace KickoffSearch; class MyKickoffSearchInterface :public KickoffSearchInterface { - Q_OBJECT + TQ_OBJECT public: MyKickoffSearchInterface( KMenu*, TQObject* parent, const char* name = 0 ); diff --git a/kicker/kicker/ui/popupmenutitle.h b/kicker/kicker/ui/popupmenutitle.h index d839a3b84..7aa839218 100644 --- a/kicker/kicker/ui/popupmenutitle.h +++ b/kicker/kicker/ui/popupmenutitle.h @@ -46,7 +46,7 @@ public: { p->save(); TQRect r(x, y, w, h); - kapp->style().tqdrawPrimitive(TQStyle::PE_HeaderSectionMenu, + kapp->style().drawPrimitive(TQStyle::PE_HeaderSectionMenu, p, r, cg); if (!m_desktopName.isEmpty()) diff --git a/kicker/kicker/ui/quickbrowser_mnu.h b/kicker/kicker/ui/quickbrowser_mnu.h index 01b12d09d..98a3eb4c4 100644 --- a/kicker/kicker/ui/quickbrowser_mnu.h +++ b/kicker/kicker/ui/quickbrowser_mnu.h @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class PanelQuickBrowser : public KPanelMenu { - Q_OBJECT + TQ_OBJECT public: PanelQuickBrowser(TQWidget *parent=0, const char *name=0); diff --git a/kicker/kicker/ui/removeapplet_mnu.cpp b/kicker/kicker/ui/removeapplet_mnu.cpp index a7bc609a6..4ce3c4ea0 100644 --- a/kicker/kicker/ui/removeapplet_mnu.cpp +++ b/kicker/kicker/ui/removeapplet_mnu.cpp @@ -37,8 +37,8 @@ PanelRemoveAppletMenu::PanelRemoveAppletMenu(ContainerArea* cArea, const char *name) : TQPopupMenu(parent, name), m_containerArea(cArea) { - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); - connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); } void PanelRemoveAppletMenu::slotAboutToShow() @@ -81,7 +81,7 @@ void PanelRemoveAppletMenu::slotAboutToShow() if (m_containers.count() > 1) { insertSeparator(); - insertItem(i18n("All"), this, TQT_SLOT(slotRemoveAll()), 0, id); + insertItem(i18n("All"), this, TQ_SLOT(slotRemoveAll()), 0, id); } } diff --git a/kicker/kicker/ui/removeapplet_mnu.h b/kicker/kicker/ui/removeapplet_mnu.h index 895ded710..17b24b496 100644 --- a/kicker/kicker/ui/removeapplet_mnu.h +++ b/kicker/kicker/ui/removeapplet_mnu.h @@ -34,7 +34,7 @@ class ContainerArea; class PanelRemoveAppletMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: PanelRemoveAppletMenu(ContainerArea* cArea, TQWidget* parent = 0, const char* name = 0); diff --git a/kicker/kicker/ui/removebutton_mnu.cpp b/kicker/kicker/ui/removebutton_mnu.cpp index 819eff533..6617975f5 100644 --- a/kicker/kicker/ui/removebutton_mnu.cpp +++ b/kicker/kicker/ui/removebutton_mnu.cpp @@ -40,8 +40,8 @@ PanelRemoveButtonMenu::PanelRemoveButtonMenu( ContainerArea* cArea, TQWidget *parent, const char *name ) : TQPopupMenu( parent, name ), containerArea( cArea ) { - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); - connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); } void PanelRemoveButtonMenu::addToContainers(const TQString& type) @@ -89,7 +89,7 @@ void PanelRemoveButtonMenu::slotAboutToShow() if (containers.count() > 1) { insertSeparator(); - insertItem(i18n("All"), this, TQT_SLOT(slotRemoveAll()), 0, id); + insertItem(i18n("All"), this, TQ_SLOT(slotRemoveAll()), 0, id); } } diff --git a/kicker/kicker/ui/removebutton_mnu.h b/kicker/kicker/ui/removebutton_mnu.h index 211edd771..d3b5d7237 100644 --- a/kicker/kicker/ui/removebutton_mnu.h +++ b/kicker/kicker/ui/removebutton_mnu.h @@ -34,7 +34,7 @@ class ContainerArea; class PanelRemoveButtonMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: PanelRemoveButtonMenu( ContainerArea *cArea, TQWidget *parent=0, const char *name=0 ); diff --git a/kicker/kicker/ui/removecontainer_mnu.cpp b/kicker/kicker/ui/removecontainer_mnu.cpp index 1b30506cc..a447b4d66 100644 --- a/kicker/kicker/ui/removecontainer_mnu.cpp +++ b/kicker/kicker/ui/removecontainer_mnu.cpp @@ -44,7 +44,7 @@ RemoveContainerMenu::RemoveContainerMenu( ContainerArea* cArea, buttonId = insertItem(i18n("Appli&cation"), new PanelRemoveButtonMenu( containerArea, this ) ); adjustSize(); - connect( this, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) ); + connect( this, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotAboutToShow() ) ); } RemoveContainerMenu::~RemoveContainerMenu() diff --git a/kicker/kicker/ui/removecontainer_mnu.h b/kicker/kicker/ui/removecontainer_mnu.h index bd6d03d89..4f5546449 100644 --- a/kicker/kicker/ui/removecontainer_mnu.h +++ b/kicker/kicker/ui/removecontainer_mnu.h @@ -30,7 +30,7 @@ class ContainerArea; class RemoveContainerMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: RemoveContainerMenu(ContainerArea* cArea, TQWidget *parent=0, const char *name=0); diff --git a/kicker/kicker/ui/removeextension_mnu.cpp b/kicker/kicker/ui/removeextension_mnu.cpp index 829dfab5c..ef345921d 100644 --- a/kicker/kicker/ui/removeextension_mnu.cpp +++ b/kicker/kicker/ui/removeextension_mnu.cpp @@ -37,8 +37,8 @@ static const int REMOVEALLID = 1000; PanelRemoveExtensionMenu::PanelRemoveExtensionMenu( TQWidget *parent, const char *name ) : TQPopupMenu( parent, name ) { - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); - connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); } PanelRemoveExtensionMenu::PanelRemoveExtensionMenu() diff --git a/kicker/kicker/ui/removeextension_mnu.h b/kicker/kicker/ui/removeextension_mnu.h index e77522bc8..847179caa 100644 --- a/kicker/kicker/ui/removeextension_mnu.h +++ b/kicker/kicker/ui/removeextension_mnu.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class PanelRemoveExtensionMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: PanelRemoveExtensionMenu( TQWidget *parent=0, const char *name=0 ); diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index b7e069706..e661ee1ea 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/kicker/kicker/ui/service_mnu.cpp @@ -68,10 +68,10 @@ PanelServiceMenu::PanelServiceMenu(const TQString & label, const TQString & relP { excludeNoDisplay_=true; - connect(KSycoca::self(), TQT_SIGNAL(databaseChanged()), - TQT_SLOT(slotClearOnClose())); - connect(this, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotClose())); - connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotSetTooltip(int))); + connect(KSycoca::self(), TQ_SIGNAL(databaseChanged()), + TQ_SLOT(slotClearOnClose())); + connect(this, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(slotClose())); + connect(this, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotSetTooltip(int))); } PanelServiceMenu::~PanelServiceMenu() @@ -378,7 +378,7 @@ void PanelServiceMenu::doInitialize() if (relPath_ == "") { insertItem(KickerLib::menuIconSet("application-x-executable"), i18n("Add Non-TDE Application"), - this, TQT_SLOT(addNonKDEApp())); + this, TQ_SLOT(addNonKDEApp())); } if (list.count() > 0) { @@ -571,7 +571,7 @@ void PanelServiceMenu::mousePressEvent(TQMouseEvent * ev) void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev) { - if (ev->button() == Qt::RightButton && !Kicker::the()->isKioskImmutable()) + if (ev->button() == TQt::RightButton && !Kicker::the()->isKioskImmutable()) { int id = idAt( ev->pos() ); @@ -590,7 +590,7 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev) delete popupMenu_; popupMenu_ = new TDEPopupMenu(this); - connect(popupMenu_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContextMenu(int))); + connect(popupMenu_, TQ_SIGNAL(activated(int)), TQ_SLOT(slotContextMenu(int))); bool hasEntries = false; switch (contextKSycocaEntry_->sycocaType()) @@ -696,7 +696,7 @@ void PanelServiceMenu::slotContextMenu(int selected) } case EditItem: - proc = new TDEProcess(TQT_TQOBJECT(this)); + proc = new TDEProcess(this); *proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+relPath_ << static_cast<KService *>(contextKSycocaEntry_)->menuId(); proc->start(); @@ -740,7 +740,7 @@ void PanelServiceMenu::slotContextMenu(int selected) } case EditMenu: - proc = new TDEProcess(TQT_TQOBJECT(this)); + proc = new TDEProcess(this); *proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+static_cast<KServiceGroup *>(contextKSycocaEntry_)->relPath(); proc->start(); @@ -758,7 +758,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev) if (Kicker::the()->isKioskImmutable()) return; - if ( (ev->state() & Qt::LeftButton ) != Qt::LeftButton ) + if ( (ev->state() & TQt::LeftButton ) != TQt::LeftButton ) return; TQPoint p = ev->pos() - startPos_; @@ -814,7 +814,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev) // path from KStdDirs. KURLDrag *d = new KURLDrag(KURL::List(url), this); - connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDragObjectDestroyed())); + connect(d, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDragObjectDestroyed())); d->setPixmap(icon); d->dragCopy(); @@ -840,7 +840,7 @@ void PanelServiceMenu::dragEnterEvent(TQDragEnterEvent *event) void PanelServiceMenu::dragLeaveEvent(TQDragLeaveEvent *) { // see PanelServiceMenu::dragEnterEvent why this is nescessary - if (!TQT_TQRECT_OBJECT(frameGeometry()).contains(TQCursor::pos())) + if (!frameGeometry().contains(TQCursor::pos())) { KURLDrag::setTarget(0); } @@ -857,7 +857,7 @@ void PanelServiceMenu::slotDragObjectDestroyed() // the execution of any code after the original exec() statement // though the panels themselves continue on otherwise normally // (we just have some sort of nested event loop) - TQTimer::singleShot(0, this, TQT_SLOT(close())); + TQTimer::singleShot(0, this, TQ_SLOT(close())); } } @@ -898,7 +898,7 @@ void PanelServiceMenu::slotClear() // QPopupMenu's aboutToHide() is emitted before the popup is really hidden, // and also before a click in the menu is handled, so do the clearing // only after that has been handled - TQTimer::singleShot(100, this, TQT_SLOT(slotClear())); + TQTimer::singleShot(100, this, TQ_SLOT(slotClear())); return; } diff --git a/kicker/kicker/ui/service_mnu.h b/kicker/kicker/ui/service_mnu.h index 9cbfaa068..a52e10d45 100644 --- a/kicker/kicker/ui/service_mnu.h +++ b/kicker/kicker/ui/service_mnu.h @@ -50,7 +50,7 @@ typedef TQMap<PanelServiceMenu*,int> PanelServiceMenuMap; class KDE_EXPORT PanelServiceMenu : public KPanelMenu { - Q_OBJECT + TQ_OBJECT public: PanelServiceMenu(const TQString & label, const TQString & relPath, diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp index 62f7f055a..224cf427a 100644 --- a/kicker/libkicker/global.cpp +++ b/kicker/libkicker/global.cpp @@ -114,19 +114,19 @@ KPanelApplet::Direction arrowToDirection(TQt::ArrowType p) { switch (p) { - case Qt::DownArrow: + case TQt::DownArrow: return KPanelApplet::Down; break; - case Qt::LeftArrow: + case TQt::LeftArrow: return KPanelApplet::Left; break; - case Qt::RightArrow: + case TQt::RightArrow: return KPanelApplet::Right; break; - case Qt::UpArrow: + case TQt::UpArrow: default: return KPanelApplet::Up; break; @@ -464,20 +464,15 @@ TQIconSet menuIconSet(const TQString& icon) void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color, int alpha) { static TQPixmap pix; - static TQColor last_color = Qt::black; + static TQColor last_color = TQt::black; static int last_alpha = 0; if (pix.isNull() || last_color != color || last_alpha != alpha) { TQImage img(16, 16, 32); -#ifdef USE_QT4 + img.setAlphaBuffer(false); + img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF)); img.setAlphaBuffer(true); - img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF)); -#else // USE_QT4 - img.setAlphaBuffer(false); - img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF)); - img.setAlphaBuffer(true); -#endif // USE_QT4 pix.convertFromImage(img); last_color = color; last_alpha = alpha; diff --git a/kicker/libkicker/global.h b/kicker/libkicker/global.h index 663987174..61ba2f0ea 100644 --- a/kicker/libkicker/global.h +++ b/kicker/libkicker/global.h @@ -57,7 +57,7 @@ KDE_EXPORT void colorize(TQImage& image); /** * Blend a color rectangle on a painter */ -KDE_EXPORT void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color = Qt::black, int alpha = 0x40); +KDE_EXPORT void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color = TQt::black, int alpha = 0x40); /** * Blend two colours together to get a colour halfway in between diff --git a/kicker/libkicker/kickerSettings.kcfg b/kicker/libkicker/kickerSettings.kcfg index 5ab6880aa..9951fe9e1 100644 --- a/kicker/libkicker/kickerSettings.kcfg +++ b/kicker/libkicker/kickerSettings.kcfg @@ -316,7 +316,7 @@ <entry name="KMenuTileColor" type="Color" > <label>Color to use for Kmenu button background</label> - <default code="true">QColor()</default> + <default code="true">TQColor()</default> </entry> <entry name="DesktopButtonTile" type="Path" > @@ -325,7 +325,7 @@ <entry name="DesktopButtonTileColor" type="Color" > <label>Color to use for Kmenu button background</label> - <default code="true">QColor()</default> + <default code="true">TQColor()</default> </entry> <entry name="URLTile" type="Path" > @@ -334,7 +334,7 @@ <entry name="URLTileColor" type="Color" > <label>Color to use for Application, URL and special button backgrounds</label> - <default code="true">QColor()</default> + <default code="true">TQColor()</default> </entry> <entry name="BrowserTile" type="Path" > @@ -343,7 +343,7 @@ <entry name="BrowserTileColor" type="Color" > <label>Color to use for Browser button background</label> - <default code="true">QColor()</default> + <default code="true">TQColor()</default> </entry> <entry name="WindowListTile" type="Path" > @@ -352,7 +352,7 @@ <entry name="WindowListTileColor" type="Color" > <label>Color to use for Window List button background</label> - <default code="true">QColor()</default> + <default code="true">TQColor()</default> </entry> </group> @@ -416,7 +416,12 @@ <entry name="CustomKMenuIcon" key="CustomIcon" type="Path" > <label>Custom TDE Menu Button Icon</label> - <default code="true">QString("kmenu")</default> + <default code="true">TQString("kmenu")</default> + </entry> + + <entry name="SearchShortcut" type="String" > + <label>Search shortcut</label> + <default>/</default> </entry> </group> diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp index 0a6000f37..c896c830a 100644 --- a/kicker/libkicker/kickertip.cpp +++ b/kicker/libkicker/kickertip.cpp @@ -76,13 +76,13 @@ KickerTip::KickerTip(TQWidget * parent) m_timer(0, "KickerTip::m_timer"), m_frameTimer(0, "KickerTip::m_frameTimer") { - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setBackgroundMode(NoBackground); resize(0, 0); hide(); - connect(&m_frameTimer, TQT_SIGNAL(timeout()), TQT_SLOT(internalUpdate())); + connect(&m_frameTimer, TQ_SIGNAL(timeout()), TQ_SLOT(internalUpdate())); // // FIXME: The settingsChanged(SettingsCategory) signal is not available under Trinity; where was it originally supposed to come from? -// connect(kapp, TQT_SIGNAL(settingsChanged(SettingsCategory)), TQT_SLOT(slotSettingsChanged())); +// connect(kapp, TQ_SIGNAL(settingsChanged(SettingsCategory)), TQ_SLOT(slotSettingsChanged())); } KickerTip::~KickerTip() @@ -176,8 +176,8 @@ void KickerTip::display() // close the message window after given mS if (data.duration > 0) { - disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0); - connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(hide())); + disconnect(&m_timer, TQ_SIGNAL(timeout()), 0, 0); + connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(hide())); m_timer.start(data.duration, true); } else @@ -283,10 +283,10 @@ void KickerTip::plainMask() { TQPainter maskPainter(&m_mask); - m_mask.fill(Qt::color0); + m_mask.fill(TQt::color0); - maskPainter.setBrush(Qt::color1); - maskPainter.setPen(Qt::NoPen); + maskPainter.setBrush(TQt::color1); + maskPainter.setPen(TQt::NoPen); //maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height()); drawRoundRect(maskPainter, m_mask.rect()); setMask(m_mask); @@ -297,10 +297,10 @@ void KickerTip::dissolveMask() { TQPainter maskPainter(&m_mask); - m_mask.fill(Qt::color0); + m_mask.fill(TQt::color0); - maskPainter.setBrush(Qt::color1); - maskPainter.setPen(Qt::NoPen); + maskPainter.setBrush(TQt::color1); + maskPainter.setPen(TQt::NoPen); //maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height()); drawRoundRect(maskPainter, m_mask.rect()); @@ -424,16 +424,16 @@ void KickerTip::tipFor(const TQWidget* w) { if (m_tippingFor) { - disconnect(m_tippingFor, TQT_SIGNAL(destroyed(TQObject*)), - this, TQT_SLOT(tipperDestroyed(TQObject*))); + disconnect(m_tippingFor, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(tipperDestroyed(TQObject*))); } m_tippingFor = w; if (m_tippingFor) { - connect(m_tippingFor, TQT_SIGNAL(destroyed(TQObject*)), - this, TQT_SLOT(tipperDestroyed(TQObject*))); + connect(m_tippingFor, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(tipperDestroyed(TQObject*))); } } @@ -452,7 +452,7 @@ void KickerTip::tipperDestroyed(TQObject* o) { // we can't do a dynamic cast because we are in the process of dying // so static it is. - untipFor(TQT_TQWIDGET(o)); + untipFor(static_cast<TQWidget*>(o)); } void KickerTip::internalUpdate() @@ -508,7 +508,7 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event) return false; } - TQWidget *widget = TQT_TQWIDGET(object); + TQWidget *widget = static_cast<TQWidget*>(object); switch (event->type()) { @@ -526,8 +526,8 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event) tipFor(widget); m_timer.stop(); - disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0); - connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(display())); + disconnect(&m_timer, TQ_SIGNAL(timeout()), 0, 0); + connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(display())); // delay to avoid false starts // e.g. when the user quickly zooms their mouse over @@ -547,8 +547,8 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event) if (isTippingFor(widget) && isVisible()) { - disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0); - connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(hide())); + disconnect(&m_timer, TQ_SIGNAL(timeout()), 0, 0); + connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(hide())); m_timer.start(KickerSettings::mouseOversHideDelay(), true); } diff --git a/kicker/libkicker/kickertip.h b/kicker/libkicker/kickertip.h index b7332967f..7295b4efa 100644 --- a/kicker/libkicker/kickertip.h +++ b/kicker/libkicker/kickertip.h @@ -40,7 +40,7 @@ class TQTimer; class KDE_EXPORT KickerTip : public TQWidget { - Q_OBJECT + TQ_OBJECT public: enum MaskEffect { Plain, Dissolve }; diff --git a/kicker/libkicker/kshadowengine.cpp b/kicker/libkicker/kshadowengine.cpp index a933026d5..76f1b9d87 100644 --- a/kicker/libkicker/kshadowengine.cpp +++ b/kicker/libkicker/kshadowengine.cpp @@ -236,7 +236,7 @@ void KTextShadowEngine::drawText(TQPainter &p, const TQRect &tr, int tf, const T // draw text pixPainter.begin(&textPixmap); - pixPainter.setPen(Qt::white); + pixPainter.setPen(TQt::white); pixPainter.setFont(p.font()); // get the font from the root painter pixPainter.drawText(tr, tf, str); pixPainter.end(); diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp index a8e4bf1fa..8cdc4c664 100644 --- a/kicker/libkicker/menuinfo.cpp +++ b/kicker/libkicker/menuinfo.cpp @@ -64,5 +64,5 @@ KPanelMenu* MenuInfo::load(TQWidget *parent, const char *name) return KParts::ComponentFactory::createInstanceFromLibrary<KPanelMenu>( TQFile::encodeName( library_ ), - TQT_TQOBJECT(parent), name ); + parent, name ); } diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp index aaac124c2..0708d0b5f 100644 --- a/kicker/libkicker/panelbutton.cpp +++ b/kicker/libkicker/panelbutton.cpp @@ -74,7 +74,7 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard m_arrowDirection(KPanelExtension::Bottom), m_popupDirection(KPanelApplet::Up), m_iconAlignment(AlignCenter), - m_orientation(Qt::Horizontal), + m_orientation(TQt::Horizontal), m_size((TDEIcon::StdSizes)-1), m_fontPercent(0.40), m_forceStandardCursor(forceStandardCursor) @@ -93,8 +93,8 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard installEventFilter(KickerTip::the()); - connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(updateSettings(int))); - connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(updateIcon(int))); + connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(updateSettings(int))); + connect(kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(updateIcon(int))); } void PanelButton::configure() @@ -196,7 +196,7 @@ void PanelButton::setPopupDirection(KPanelApplet::Direction d) setArrowDirection(KickerLib::directionToPopupPosition(d)); } -void PanelButton::setIconAlignment(TQ_Alignment align) +void PanelButton::setIconAlignment(TQt::AlignmentFlags align) { m_iconAlignment = align; update(); @@ -245,7 +245,7 @@ void PanelButton::checkForDeletion(const TQString& path) if (path == m_backingFile) { setEnabled(false); - TQTimer::singleShot(1000, this, TQT_SLOT(scheduleForRemoval())); + TQTimer::singleShot(1000, this, TQ_SLOT(scheduleForRemoval())); } } @@ -278,7 +278,7 @@ void PanelButton::scheduleForRemoval() } timelapse *= 2; - TQTimer::singleShot(timelapse, this, TQT_SLOT(scheduleForRemoval())); + TQTimer::singleShot(timelapse, this, TQ_SLOT(scheduleForRemoval())); } } @@ -305,7 +305,7 @@ int PanelButton::widthForHeight(int height) const // we only paint the text when horizontal, so make sure we're horizontal // before adding the text in here - if (orientation() == Qt::Horizontal && !m_buttonText.isEmpty()) + if (orientation() == TQt::Horizontal && !m_buttonText.isEmpty()) { TQFont f(font()); //f.setPixelSize(KMIN(height, KMAX(int(float(height) * m_fontPercent), 16))); @@ -483,7 +483,7 @@ void PanelButton::dropEvent(TQDropEvent* e) void PanelButton::mouseMoveEvent(TQMouseEvent *e) { - if (!m_isLeftMouseButtonDown || (e->state() & Qt::LeftButton) == 0) + if (!m_isLeftMouseButtonDown || (e->state() & TQt::LeftButton) == 0) { return; } @@ -501,7 +501,7 @@ void PanelButton::mouseMoveEvent(TQMouseEvent *e) void PanelButton::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { m_lastLeftMouseButtonPress = e->pos(); m_isLeftMouseButtonDown = true; @@ -511,7 +511,7 @@ void PanelButton::mousePressEvent(TQMouseEvent *e) void PanelButton::mouseReleaseEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { m_isLeftMouseButtonDown = false; @@ -540,7 +540,7 @@ void PanelButton::drawButton(TQPainter *p) if (m_tileColor.isValid()) { p->fillRect(rect(), m_tileColor); - style().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup()); + style().drawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup()); } else if (paletteBackgroundPixmap()) { @@ -560,7 +560,7 @@ void PanelButton::drawButton(TQPainter *p) else if (isDown() || isOn()) { // Draw shapes to indicate the down state. - style().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken); + style().drawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken); } drawButtonLabel(p); @@ -568,9 +568,9 @@ void PanelButton::drawButton(TQPainter *p) if (hasFocus() || m_hasAcceptedDrag) { int x1, y1, x2, y2; - TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2); + rect().coords(&x1, &y1, &x2, &y2); TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3); - style().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(), + style().drawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(), TQStyle::Style_Default, colorGroup().button()); } } @@ -582,7 +582,7 @@ void PanelButton::drawDeepButton(TQPainter *p) if (m_tileColor.isValid()) { p->fillRect(rect(), m_tileColor); - style().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup()); + style().drawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup()); } else if (paletteBackgroundPixmap()) { @@ -596,10 +596,10 @@ void PanelButton::drawDeepButton(TQPainter *p) TQRect btn_rect = TQRect(rect().x(), rect().y()+1, rect().width(), rect().height()-2); if (isDown() || isOn()) { - style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Down); + style().drawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Down); } else { - style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Raised); + style().drawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Raised); } drawButtonLabel(p,0,FALSE); @@ -607,9 +607,9 @@ void PanelButton::drawDeepButton(TQPainter *p) if (hasFocus() || m_hasAcceptedDrag) { int x1, y1, x2, y2; - TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2); + rect().coords(&x1, &y1, &x2, &y2); TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3); - style().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(), + style().drawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(), TQStyle::Style_Default, colorGroup().button()); } } @@ -645,7 +645,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow) else if (m_iconAlignment & AlignBottom) y = (height() - icon.height()); - if (!m_buttonText.isEmpty() && orientation() == Qt::Horizontal) + if (!m_buttonText.isEmpty() && orientation() == TQt::Horizontal) { int h = height(); int w = width(); @@ -749,7 +749,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow) r = TQRect(0, (height() - arrowSize)/2, arrowSize, arrowSize); break; case KPanelExtension::Floating: - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { e = TQStyle::PE_ArrowDown; r.moveBy(0, height() - arrowSize); @@ -772,7 +772,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow) { flags |= TQStyle::Style_Down; } - style().tqdrawPrimitive(e, p, r, colorGroup(), flags); + style().drawPrimitive(e, p, r, colorGroup(), flags); } } @@ -795,7 +795,7 @@ int PanelButton::preferredIconSize(int proposed_size) const if (proposed_size < 0) { - proposed_size = (orientation() == Qt::Horizontal) ? height() : width(); + proposed_size = (orientation() == TQt::Horizontal) ? height() : width(); } // determine the upper limit on the size. Normally, this is panelSize, @@ -833,16 +833,16 @@ void PanelButton::backedByFile(const TQString& localFilePath) } // avoid multiple connections - disconnect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)), - this, TQT_SLOT(checkForDeletion(const TQString&))); + disconnect(KDirWatch::self(), TQ_SIGNAL(deleted(const TQString&)), + this, TQ_SLOT(checkForDeletion(const TQString&))); if (!KDirWatch::self()->contains(m_backingFile)) { KDirWatch::self()->addFile(m_backingFile); } - connect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)), - this, TQT_SLOT(checkForDeletion(const TQString&))); + connect(KDirWatch::self(), TQ_SIGNAL(deleted(const TQString&)), + this, TQ_SLOT(checkForDeletion(const TQString&))); } @@ -966,7 +966,7 @@ PanelPopupButton::PanelPopupButton(TQWidget *parent, const char *name, bool forc m_pressedDuringPopup(false), m_initialized(false) { - connect(this, TQT_SIGNAL(pressed()), TQT_SLOT(slotExecMenu())); + connect(this, TQ_SIGNAL(pressed()), TQ_SLOT(slotExecMenu())); } void PanelPopupButton::setPopup(TQWidget *popup) @@ -974,7 +974,7 @@ void PanelPopupButton::setPopup(TQWidget *popup) if (m_popup) { m_popup->removeEventFilter(this); - disconnect(m_popup, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(menuAboutToHide())); + disconnect(m_popup, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(menuAboutToHide())); } m_popup = popup; @@ -983,7 +983,7 @@ void PanelPopupButton::setPopup(TQWidget *popup) if (m_popup) { m_popup->installEventFilter(this); - connect(m_popup, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(menuAboutToHide())); + connect(m_popup, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(menuAboutToHide())); } } @@ -996,8 +996,8 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) { if (e->type() == TQEvent::MouseMove) { - TQMouseEvent *me = TQT_TQMOUSEEVENT(e); - if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos())) && + TQMouseEvent *me = static_cast<TQMouseEvent*>(e); + if (rect().contains(mapFromGlobal(me->globalPos())) && ((me->state() & ControlButton) != 0 || (me->state() & ShiftButton) != 0)) { @@ -1008,8 +1008,8 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) else if (e->type() == TQEvent::MouseButtonPress || e->type() == TQEvent::MouseButtonDblClick) { - TQMouseEvent *me = TQT_TQMOUSEEVENT(e); - if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos()))) + TQMouseEvent *me = static_cast<TQMouseEvent*>(e); + if (rect().contains(mapFromGlobal(me->globalPos()))) { m_pressedDuringPopup = true; return true; @@ -1017,8 +1017,8 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) } else if (e->type() == TQEvent::MouseButtonRelease) { - TQMouseEvent *me = TQT_TQMOUSEEVENT(e); - if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos()))) + TQMouseEvent *me = static_cast<TQMouseEvent*>(e); + if (rect().contains(mapFromGlobal(me->globalPos()))) { if (m_pressedDuringPopup && m_popup) { diff --git a/kicker/libkicker/panelbutton.h b/kicker/libkicker/panelbutton.h index 80b26f377..cea132680 100644 --- a/kicker/libkicker/panelbutton.h +++ b/kicker/libkicker/panelbutton.h @@ -45,7 +45,7 @@ class KShadowEngine; */ class KDE_EXPORT PanelButton: public TQButton, public KickerTip::Client { - Q_OBJECT + TQ_OBJECT public: /** @@ -263,7 +263,7 @@ public slots: protected: - void setIconAlignment(TQ_Alignment align); + void setIconAlignment(TQt::AlignmentFlags align); /** * Subclasses must implement this to define the name of the button which is * used to identify this button for saving and loading. It must be unique @@ -406,7 +406,7 @@ private: TQPixmap m_iconz; // mouse over KPanelExtension::Position m_arrowDirection; KPanelApplet::Direction m_popupDirection; - TQ_Alignment m_iconAlignment; + TQt::AlignmentFlags m_iconAlignment; Orientation m_orientation; int m_size; double m_fontPercent; @@ -422,7 +422,7 @@ private: */ class KDE_EXPORT PanelPopupButton : public PanelButton { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kicker/libkicker/panner.cpp b/kicker/libkicker/panner.cpp index ec06b30c9..0401cfcdc 100644 --- a/kicker/libkicker/panner.cpp +++ b/kicker/libkicker/panner.cpp @@ -46,7 +46,7 @@ Panner::Panner( TQWidget* parent, const char* name ) setBackgroundOrigin( AncestorOrigin ); _updateScrollButtonsTimer = new TQTimer(this); - connect(_updateScrollButtonsTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reallyUpdateScrollButtons())); + connect(_updateScrollButtonsTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(reallyUpdateScrollButtons())); _clipper = new TQWidget(this); _clipper->setBackgroundOrigin(AncestorOrigin); @@ -57,7 +57,7 @@ Panner::Panner( TQWidget* parent, const char* name ) // layout _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight); _layout->addWidget(_clipper, 1); - setOrientation(Qt::Horizontal); + setOrientation(TQt::Horizontal); } Panner::~Panner() @@ -78,8 +78,8 @@ void Panner::createScrollButtons() _luSB->setMinimumSize(12, 12); _luSB->hide(); _layout->addWidget(_luSB); - connect(_luSB, TQT_SIGNAL(pressed()), TQT_SLOT(startScrollLeftUp())); - connect(_luSB, TQT_SIGNAL(released()), TQT_SLOT(stopScroll())); + connect(_luSB, TQ_SIGNAL(pressed()), TQ_SLOT(startScrollLeftUp())); + connect(_luSB, TQ_SIGNAL(released()), TQ_SLOT(stopScroll())); // right/down scroll button _rdSB = new SimpleArrowButton(this); @@ -88,8 +88,8 @@ void Panner::createScrollButtons() _rdSB->setMinimumSize(12, 12); _rdSB->hide(); _layout->addWidget(_rdSB); - connect(_rdSB, TQT_SIGNAL(pressed()), TQT_SLOT(startScrollRightDown())); - connect(_rdSB, TQT_SIGNAL(released()), TQT_SLOT(stopScroll())); + connect(_rdSB, TQ_SIGNAL(pressed()), TQ_SLOT(startScrollRightDown())); + connect(_rdSB, TQ_SIGNAL(released()), TQ_SLOT(stopScroll())); // set up the buttons setupButtons(); @@ -97,12 +97,12 @@ void Panner::createScrollButtons() void Panner::setupButtons() { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { if (_luSB) { - _luSB->setArrowType(Qt::LeftArrow); - _rdSB->setArrowType(Qt::RightArrow); + _luSB->setArrowType(TQt::LeftArrow); + _rdSB->setArrowType(TQt::RightArrow); _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); TQToolTip::add(_luSB, i18n("Scroll left")); @@ -115,8 +115,8 @@ void Panner::setupButtons() { if (_luSB) { - _luSB->setArrowType(Qt::UpArrow); - _rdSB->setArrowType(Qt::DownArrow); + _luSB->setArrowType(TQt::UpArrow); + _rdSB->setArrowType(TQt::DownArrow); _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); TQToolTip::add(_luSB, i18n("Scroll up")); @@ -149,7 +149,7 @@ void Panner::resizeEvent( TQResizeEvent* ) void Panner::scrollRightDown() { - if(orientation() == Qt::Horizontal) // scroll right + if(orientation() == TQt::Horizontal) // scroll right scrollBy( _step, 0 ); else // scroll down scrollBy( 0, _step ); @@ -159,7 +159,7 @@ void Panner::scrollRightDown() void Panner::scrollLeftUp() { - if(orientation() == Qt::Horizontal) // scroll left + if(orientation() == TQt::Horizontal) // scroll left scrollBy( -_step, 0 ); else // scroll up scrollBy( 0, -_step ); @@ -170,7 +170,7 @@ void Panner::scrollLeftUp() void Panner::startScrollRightDown() { _scrollTimer = new TQTimer(this); - connect(_scrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(scrollRightDown())); + connect(_scrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(scrollRightDown())); _scrollTimer->start(50); _step = 8; scrollRightDown(); @@ -179,7 +179,7 @@ void Panner::startScrollRightDown() void Panner::startScrollLeftUp() { _scrollTimer = new TQTimer(this); - connect(_scrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(scrollLeftUp())); + connect(_scrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(scrollLeftUp())); _scrollTimer->start(50); _step = 8; scrollLeftUp(); @@ -197,7 +197,7 @@ void Panner::reallyUpdateScrollButtons() _updateScrollButtonsTimer->stop(); - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { delta = contentsWidth() - width(); } @@ -336,7 +336,7 @@ void Panner::ensureVisible( int x, int y, int xmargin, int ymargin ) bool Panner::eventFilter( TQObject *obj, TQEvent *e ) { - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(_viewport) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(_clipper) ) + if ( obj == _viewport || obj == _clipper ) { switch ( e->type() ) { diff --git a/kicker/libkicker/panner.h b/kicker/libkicker/panner.h index 7ae68d096..36305bb0c 100644 --- a/kicker/libkicker/panner.h +++ b/kicker/libkicker/panner.h @@ -33,7 +33,7 @@ class TQTimer; class KDE_EXPORT Panner : public TQWidget { - Q_OBJECT + TQ_OBJECT public: Panner( TQWidget* parent, const char* name = 0 ); @@ -41,8 +41,8 @@ public: TQSize minimumSizeHint() const { return TQWidget::minimumSizeHint(); } - Qt::Orientation orientation() const { return _orient; } - virtual void setOrientation(Qt::Orientation orientation); + TQt::Orientation orientation() const { return _orient; } + virtual void setOrientation(TQt::Orientation orientation); TQWidget *viewport() const { return _viewport; } diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp index 12d5085d4..79fd19915 100644 --- a/kicker/libkicker/simplebutton.cpp +++ b/kicker/libkicker/simplebutton.cpp @@ -42,15 +42,15 @@ SimpleButton::SimpleButton(TQWidget *parent, const char *name, bool forceStandardCursor) : TQButton(parent, name), m_highlight(false), - m_orientation(Qt::Horizontal), + m_orientation(TQt::Horizontal), m_forceStandardCursor(forceStandardCursor) { setBackgroundOrigin( AncestorOrigin ); - connect( kapp, TQT_SIGNAL( settingsChanged( int ) ), - TQT_SLOT( slotSettingsChanged( int ) ) ); - connect( kapp, TQT_SIGNAL( iconChanged( int ) ), - TQT_SLOT( slotIconChanged( int ) ) ); + connect( kapp, TQ_SIGNAL( settingsChanged( int ) ), + TQ_SLOT( slotSettingsChanged( int ) ) ); + connect( kapp, TQ_SIGNAL( iconChanged( int ) ), + TQ_SLOT( slotIconChanged( int ) ) ); kapp->addKipcEventMask( KIPC::SettingsChanged ); kapp->addKipcEventMask( KIPC::IconChanged ); @@ -65,7 +65,7 @@ void SimpleButton::setPixmap(const TQPixmap &pix) update(); } -void SimpleButton::setOrientation(Qt::Orientation orientation) +void SimpleButton::setOrientation(TQt::Orientation orientation) { m_orientation = orientation; update(); @@ -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; - style().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, r, colorGroup(), flags); + style().drawPrimitive(TQStyle::PE_ButtonTool, p, r, colorGroup(), flags); } } @@ -220,7 +220,7 @@ void SimpleButton::resizeEvent( TQResizeEvent * ) } -SimpleArrowButton::SimpleArrowButton(TQWidget *parent, Qt::ArrowType arrow, const char *name, bool forceStandardCursor) +SimpleArrowButton::SimpleArrowButton(TQWidget *parent, TQt::ArrowType arrow, const char *name, bool forceStandardCursor) : SimpleButton(parent, name, forceStandardCursor), m_forceStandardCursor(forceStandardCursor) { @@ -234,7 +234,7 @@ TQSize SimpleArrowButton::sizeHint() const return TQSize( 12, 12 ); } -void SimpleArrowButton::setArrowType(Qt::ArrowType a) +void SimpleArrowButton::setArrowType(TQt::ArrowType a) { if (_arrow != a) { @@ -243,7 +243,7 @@ void SimpleArrowButton::setArrowType(Qt::ArrowType a) } } -Qt::ArrowType SimpleArrowButton::arrowType() const +TQt::ArrowType SimpleArrowButton::arrowType() const { return _arrow; } @@ -255,15 +255,15 @@ void SimpleArrowButton::drawButton( TQPainter *p ) TQStyle::PrimitiveElement pe = TQStyle::PE_ArrowLeft; switch (_arrow) { - case Qt::LeftArrow: pe = TQStyle::PE_ArrowLeft; break; - case Qt::RightArrow: pe = TQStyle::PE_ArrowRight; break; - case Qt::UpArrow: pe = TQStyle::PE_ArrowUp; break; - case Qt::DownArrow: pe = TQStyle::PE_ArrowDown; break; + case TQt::LeftArrow: pe = TQStyle::PE_ArrowLeft; break; + case TQt::RightArrow: pe = TQStyle::PE_ArrowRight; break; + case TQt::UpArrow: pe = TQStyle::PE_ArrowUp; break; + case TQt::DownArrow: pe = TQStyle::PE_ArrowDown; break; } int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; if (isDown() || isOn()) flags |= TQStyle::Style_Down; - style().tqdrawPrimitive(pe, p, r, colorGroup(), flags); + style().drawPrimitive(pe, p, r, colorGroup(), flags); if (m_forceStandardCursor) { SimpleButton::drawButton(p); diff --git a/kicker/libkicker/simplebutton.h b/kicker/libkicker/simplebutton.h index e89571ef0..7f1718273 100644 --- a/kicker/libkicker/simplebutton.h +++ b/kicker/libkicker/simplebutton.h @@ -28,12 +28,12 @@ class KDE_EXPORT SimpleButton : public TQButton { - Q_OBJECT + TQ_OBJECT public: SimpleButton(TQWidget *parent, const char *name = 0, bool forceStandardCursor = FALSE); void setPixmap(const TQPixmap &pix); - void setOrientation(Qt::Orientation orientaton); + void setOrientation(TQt::Orientation orientaton); TQSize sizeHint() const; TQSize minimumSizeHint() const; @@ -55,7 +55,7 @@ class KDE_EXPORT SimpleButton : public TQButton TQPixmap m_normalIcon; TQPixmap m_activeIcon; TQPixmap m_disabledIcon; - Qt::Orientation m_orientation; + TQt::Orientation m_orientation; bool m_forceStandardCursor; class SimpleButtonPrivate; SimpleButtonPrivate* d; @@ -63,10 +63,10 @@ class KDE_EXPORT SimpleButton : public TQButton class KDE_EXPORT SimpleArrowButton: public SimpleButton { - Q_OBJECT + TQ_OBJECT public: - SimpleArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0, bool forceStandardCursor = FALSE); + SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0, bool forceStandardCursor = FALSE); virtual ~SimpleArrowButton() {}; TQSize sizeHint() const; @@ -74,13 +74,13 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton virtual void enterEvent( TQEvent *e ); virtual void leaveEvent( TQEvent *e ); virtual void drawButton(TQPainter *p); - Qt::ArrowType arrowType() const; + TQt::ArrowType arrowType() const; public slots: - void setArrowType(Qt::ArrowType a); + void setArrowType(TQt::ArrowType a); private: - Qt::ArrowType _arrow; + TQt::ArrowType _arrow; bool m_forceStandardCursor; bool _inside; }; diff --git a/kicker/menuext/find/findmenu.h b/kicker/menuext/find/findmenu.h index b8c3e3d96..85dd0e04d 100644 --- a/kicker/menuext/find/findmenu.h +++ b/kicker/menuext/find/findmenu.h @@ -30,7 +30,7 @@ class TQStringList; class FindMenu : public KPanelMenu { - Q_OBJECT + TQ_OBJECT public: FindMenu( TQWidget* parent, const char* name, const TQStringList &/*args*/ ); diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp index c992cf855..089a8ac93 100644 --- a/kicker/menuext/kate/katesessionmenu.cpp +++ b/kicker/menuext/kate/katesessionmenu.cpp @@ -117,7 +117,7 @@ void KateSessionMenu::initialize() // means for updating, to let the user manually update if he/she added new sessions. insertSeparator(); - insertItem( SmallIconSet("reload"), i18n("Reload Session List"), this, TQT_SLOT(reloadSessionsList()) ); + insertItem( SmallIconSet("reload"), i18n("Reload Session List"), this, TQ_SLOT(reloadSessionsList()) ); } void KateSessionMenu::slotExec( int id ) @@ -136,7 +136,7 @@ void KateSessionMenu::slotExec( int id ) TQString name = KInputDialog::getText( i18n("Session Name"), i18n("Please enter a name for the new session"), TQString::null, - &ok, 0, 0, new Validator( TQT_TQOBJECT(m_parent) ) ); + &ok, 0, 0, new Validator( m_parent ) ); if ( ! ok ) return; diff --git a/kicker/menuext/kate/katesessionmenu.h b/kicker/menuext/kate/katesessionmenu.h index 78ab50e17..b6a10e885 100644 --- a/kicker/menuext/kate/katesessionmenu.h +++ b/kicker/menuext/kate/katesessionmenu.h @@ -24,7 +24,7 @@ #include <kpanelmenu.h> class KateSessionMenu : public KPanelMenu { - Q_OBJECT + TQ_OBJECT public: KateSessionMenu( TQWidget *parent=0, const char *name=0, const TQStringList& /*args*/=TQStringList() ); ~KateSessionMenu(); diff --git a/kicker/menuext/konq-profiles/konqy_menu.h b/kicker/menuext/konq-profiles/konqy_menu.h index ba3bb19f7..927f1ec6e 100644 --- a/kicker/menuext/konq-profiles/konqy_menu.h +++ b/kicker/menuext/konq-profiles/konqy_menu.h @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class KonquerorProfilesMenu : public KPanelMenu { - Q_OBJECT + TQ_OBJECT public: KonquerorProfilesMenu(TQWidget *parent, const char *name, const TQStringList & /*args*/); diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp index c9439c8db..2e196186f 100644 --- a/kicker/menuext/konsole/konsole_mnu.cpp +++ b/kicker/menuext/konsole/konsole_mnu.cpp @@ -150,8 +150,8 @@ void KonsoleMenu::initialize() insertItem(SmallIconSet("keditbookmarks"), i18n("New Session at Bookmark"), m_bookmarksSession); connect(m_bookmarkHandlerSession, - TQT_SIGNAL(openURL(const TQString&, const TQString&)), - TQT_SLOT(newSession(const TQString&, const TQString&))); + TQ_SIGNAL(openURL(const TQString&, const TQString&)), + TQ_SLOT(newSession(const TQString&, const TQString&))); screenList.clear(); @@ -229,11 +229,11 @@ void KonsoleMenu::initialize() // we don't have any profiles, disable the menu setItemEnabled(profileID, false); } - connect(m_profileMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(launchProfile(int))); + connect(m_profileMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(launchProfile(int))); insertSeparator(); insertItem(SmallIconSet("reload"), - i18n("Reload Sessions"), this, TQT_SLOT(reinitialize())); + i18n("Reload Sessions"), this, TQ_SLOT(reinitialize())); } void KonsoleMenu::slotExec(int id) diff --git a/kicker/menuext/konsole/konsole_mnu.h b/kicker/menuext/konsole/konsole_mnu.h index 4272fbaf9..68473693f 100644 --- a/kicker/menuext/konsole/konsole_mnu.h +++ b/kicker/menuext/konsole/konsole_mnu.h @@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class KonsoleMenu : public KPanelMenu/*, public KPReloadObject*/ { - Q_OBJECT + TQ_OBJECT public: KonsoleMenu(TQWidget *parent, const char *name, const TQStringList& /* args */); diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp index 9ace6483e..b2249d858 100644 --- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp +++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp @@ -38,8 +38,8 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( KonsoleMenu *konsole, bool ) manager->setUpdate( true ); manager->setShowNSBookmarks( false ); - connect( manager, TQT_SIGNAL( changed(const TQString &, const TQString &) ), - TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) ); + connect( manager, TQ_SIGNAL( changed(const TQString &, const TQString &) ), + TQ_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) ); m_bookmarkMenu = new KonsoleBookmarkMenu( manager, this, m_menu, NULL, false, /*Not toplevel*/ false /*No 'Add Bookmark'*/ ); @@ -62,13 +62,13 @@ void KonsoleBookmarkHandler::importOldBookmarks( const TQString& path, KNSBookmarkImporter importer( path ); connect( &importer, - TQT_SIGNAL( newBookmark( const TQString&, const TQCString&, const TQString& )), - TQT_SLOT( slotNewBookmark( const TQString&, const TQCString&, const TQString& ))); + TQ_SIGNAL( newBookmark( const TQString&, const TQCString&, const TQString& )), + TQ_SLOT( slotNewBookmark( const TQString&, const TQCString&, const TQString& ))); connect( &importer, - TQT_SIGNAL( newFolder( const TQString&, bool, const TQString& )), - TQT_SLOT( slotNewFolder( const TQString&, bool, const TQString& ))); - connect( &importer, TQT_SIGNAL( newSeparator() ), TQT_SLOT( newSeparator() )); - connect( &importer, TQT_SIGNAL( endMenu() ), TQT_SLOT( endMenu() )); + TQ_SIGNAL( newFolder( const TQString&, bool, const TQString& )), + TQ_SLOT( slotNewFolder( const TQString&, bool, const TQString& ))); + connect( &importer, TQ_SIGNAL( newSeparator() ), TQ_SLOT( newSeparator() )); + connect( &importer, TQ_SIGNAL( endMenu() ), TQ_SLOT( endMenu() )); importer.parseNSBookmarks( false ); diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.h b/kicker/menuext/konsole/konsolebookmarkhandler.h index a1d2f54de..f7231fd24 100644 --- a/kicker/menuext/konsole/konsolebookmarkhandler.h +++ b/kicker/menuext/konsole/konsolebookmarkhandler.h @@ -14,7 +14,7 @@ class KonsoleMenu; class KonsoleBookmarkHandler : public TQObject, public KBookmarkOwner { - Q_OBJECT + TQ_OBJECT public: KonsoleBookmarkHandler( KonsoleMenu *konsole, bool toplevel ); diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp index 0860cc123..840b3b8f6 100644 --- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp +++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp @@ -31,14 +31,14 @@ KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr, /* * First, we disconnect KBookmarkMenu::slotAboutToShow() * Then, we connect KonsoleBookmarkMenu::slotAboutToShow(). - * They are named differently because the TQT_SLOT() macro thinks we want + * They are named differently because the TQ_SLOT() macro thinks we want * KonsoleBookmarkMenu::KBookmarkMenu::slotAboutToShow() * Could this be solved if slotAboutToShow() is virtual in KBookmarMenu? */ - disconnect( _parentMenu, TQT_SIGNAL( aboutToShow() ), this, - TQT_SLOT( slotAboutToShow() ) ); - connect( _parentMenu, TQT_SIGNAL( aboutToShow() ), - TQT_SLOT( slotAboutToShow2() ) ); + disconnect( _parentMenu, TQ_SIGNAL( aboutToShow() ), this, + TQ_SLOT( slotAboutToShow() ) ); + connect( _parentMenu, TQ_SIGNAL( aboutToShow() ), + TQ_SLOT( slotAboutToShow2() ) ); } /* @@ -100,8 +100,8 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() m_actionCollection, false, m_bAddBookmark, TQString::null ); m_lstSubMenus.append(subMenu); - connect( actionMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), subMenu, - TQT_SLOT(slotNSLoad())); + connect( actionMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), subMenu, + TQ_SLOT(slotNSLoad())); } } @@ -128,7 +128,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() // kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl; // create a normal URL item, with ID as a name TDEAction * action = new TDEAction( text, bm.icon(), 0, - this, TQT_SLOT( slotBookmarkSelected() ), + this, TQ_SLOT( slotBookmarkSelected() ), m_actionCollection, bm.url().url().utf8() ); action->setStatusText( bm.url().prettyURL() ); @@ -168,7 +168,7 @@ void KonsoleBookmarkMenu::slotBookmarkSelected() if ( !m_pOwner ) return; // this view doesn't handle bookmarks... a = (TDEAction*)sender(); b = a->text(); - m_kOwner->openBookmarkURL( TQString::fromUtf8(TQT_TQOBJECT_CONST(sender())->name()), /* URL */ + m_kOwner->openBookmarkURL( TQString::fromUtf8(sender()->name()), /* URL */ ( (TDEAction *)sender() )->text() /* Title */ ); } @@ -177,7 +177,7 @@ void KonsoleBookmarkMenu::slotNSBookmarkSelected() TDEAction *a; TQString b; - TQString link(TQT_TQOBJECT_CONST(sender())->name()+8); + TQString link(sender()->name()+8); a = (TDEAction*)sender(); b = a->text(); m_kOwner->openBookmarkURL( link, /*URL */ diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.h b/kicker/menuext/konsole/konsolebookmarkmenu.h index 103b6bc19..4bb08a798 100644 --- a/kicker/menuext/konsole/konsolebookmarkmenu.h +++ b/kicker/menuext/konsole/konsolebookmarkmenu.h @@ -23,7 +23,7 @@ class KonsoleBookmarkMenu; class KonsoleBookmarkMenu : public KBookmarkMenu { - Q_OBJECT + TQ_OBJECT public: KonsoleBookmarkMenu( KBookmarkManager* mgr, diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp index 534387394..5440c1ed7 100644 --- a/kicker/menuext/prefmenu/prefmenu.cpp +++ b/kicker/menuext/prefmenu/prefmenu.cpp @@ -60,11 +60,11 @@ PrefMenu::PrefMenu(const TQString& label, { m_subMenus.setAutoDelete(true); - connect(KSycoca::self(), TQT_SIGNAL(databaseChanged()), - this, TQT_SLOT(clearOnClose())); + connect(KSycoca::self(), TQ_SIGNAL(databaseChanged()), + this, TQ_SLOT(clearOnClose())); - connect(this, TQT_SIGNAL(aboutToHide()), - this, TQT_SLOT(aboutToClose())); + connect(this, TQ_SIGNAL(aboutToHide()), + this, TQ_SLOT(aboutToClose())); } PrefMenu::~PrefMenu() @@ -136,7 +136,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev) { KPanelMenu::mouseMoveEvent(ev); - if ((ev->state() & Qt::LeftButton) != Qt::LeftButton) + if ((ev->state() & TQt::LeftButton) != TQt::LeftButton) { return; } @@ -198,7 +198,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev) // If the path to the desktop file is relative, try to get the full // path from KStdDirs. KURLDrag *d = new KURLDrag(KURL::List(url), this); - connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(dragObjectDestroyed())); + connect(d, TQ_SIGNAL(destroyed()), this, TQ_SLOT(dragObjectDestroyed())); d->setPixmap(icon); d->dragCopy(); @@ -224,7 +224,7 @@ void PrefMenu::dragEnterEvent(TQDragEnterEvent *event) void PrefMenu::dragLeaveEvent(TQDragLeaveEvent */*event*/) { // see PrefMenu::dragEnterEvent why this is nescessary - if (!TQT_TQRECT_OBJECT(frameGeometry()).contains(TQCursor::pos())) + if (!frameGeometry().contains(TQCursor::pos())) { KURLDrag::setTarget(0); } @@ -246,7 +246,7 @@ void PrefMenu::initialize() { insertItem(KickerLib::menuIconSet("kcontrol"), i18n("Trinity Control Center"), - this, TQT_SLOT(launchControlCenter())); + this, TQ_SLOT(launchControlCenter())); insertSeparator(); } @@ -358,7 +358,7 @@ void PrefMenu::slotClear() // QPopupMenu's aboutToHide() is emitted before the popup is really hidden, // and also before a click in the menu is handled, so do the clearing // only after that has been handled - TQTimer::singleShot( 100, this, TQT_SLOT( slotClear())); + TQTimer::singleShot( 100, this, TQ_SLOT( slotClear())); return; } diff --git a/kicker/menuext/prefmenu/prefmenu.h b/kicker/menuext/prefmenu/prefmenu.h index 10befe6b2..a56391ece 100644 --- a/kicker/menuext/prefmenu/prefmenu.h +++ b/kicker/menuext/prefmenu/prefmenu.h @@ -34,7 +34,7 @@ typedef TQPtrList<TQPopupMenu> PopupMenuList; class PrefMenu : public KPanelMenu { - Q_OBJECT + TQ_OBJECT public: PrefMenu(TQWidget *parent, diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp index 19adfa868..90c84ee32 100644 --- a/kicker/menuext/recentdocs/recentdocsmenu.cpp +++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp @@ -52,7 +52,7 @@ RecentDocsMenu::~RecentDocsMenu() void RecentDocsMenu::initialize() { if (initialized()) clear(); - insertItem(SmallIconSet("history_clear"), i18n("Clear History"), this, TQT_SLOT(slotClearHistory())); + insertItem(SmallIconSet("history_clear"), i18n("Clear History"), this, TQ_SLOT(slotClearHistory())); insertSeparator(); _fileList = TDERecentDocument::recentDocuments(); @@ -111,10 +111,10 @@ void RecentDocsMenu::mousePressEvent(TQMouseEvent* e) { void RecentDocsMenu::mouseMoveEvent(TQMouseEvent* e) { KPanelMenu::mouseMoveEvent(e); - if (!(e->state() & Qt::LeftButton)) + if (!(e->state() & TQt::LeftButton)) return; - if (!TQT_TQRECT_OBJECT(rect()).contains(_mouseDown)) + if (!rect().contains(_mouseDown)) return; int dragLength = (e->pos() - _mouseDown).manhattanLength(); diff --git a/kicker/menuext/recentdocs/recentdocsmenu.h b/kicker/menuext/recentdocs/recentdocsmenu.h index 487a9fe94..2ec65a1a4 100644 --- a/kicker/menuext/recentdocs/recentdocsmenu.h +++ b/kicker/menuext/recentdocs/recentdocsmenu.h @@ -31,7 +31,7 @@ class TQPoint; class RecentDocsMenu : public KPanelMenu { - Q_OBJECT + TQ_OBJECT public: RecentDocsMenu(TQWidget* parent, const char* name, const TQStringList &/*args*/); diff --git a/kicker/menuext/remote/remotemenu.cpp b/kicker/menuext/remote/remotemenu.cpp index aeaff8e94..8c0a8407a 100644 --- a/kicker/menuext/remote/remotemenu.cpp +++ b/kicker/menuext/remote/remotemenu.cpp @@ -68,9 +68,9 @@ void RemoteMenu::initialize() } id = insertItem(SmallIcon("wizard"), i18n("Add Network Folder")); - connectItem(id, this, TQT_SLOT(startWizard())); + connectItem(id, this, TQ_SLOT(startWizard())); id = insertItem(SmallIcon("kfm"), i18n("Manage Network Folders")); - connectItem(id, this, TQT_SLOT(openRemoteDir())); + connectItem(id, this, TQ_SLOT(openRemoteDir())); insertSeparator(); diff --git a/kicker/menuext/remote/remotemenu.h b/kicker/menuext/remote/remotemenu.h index 607e1fc64..327cc79b2 100644 --- a/kicker/menuext/remote/remotemenu.h +++ b/kicker/menuext/remote/remotemenu.h @@ -26,7 +26,7 @@ class RemoteMenu : public KPanelMenu, public KDirNotify { - Q_OBJECT + TQ_OBJECT K_DCOP public: diff --git a/kicker/menuext/system/systemmenu.cpp b/kicker/menuext/system/systemmenu.cpp index 12ec087d8..e738e7af9 100644 --- a/kicker/menuext/system/systemmenu.cpp +++ b/kicker/menuext/system/systemmenu.cpp @@ -32,8 +32,8 @@ SystemMenu::SystemMenu(TQWidget *parent, const char *name, const TQStringList &/*args*/) : KPanelMenu( parent, name) { - connect( &m_dirLister, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotCompleted() ) ); + connect( &m_dirLister, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotCompleted() ) ); m_dirLister.openURL(KURL("system:/")); } diff --git a/kicker/menuext/system/systemmenu.h b/kicker/menuext/system/systemmenu.h index 1efbc3c57..26263af81 100644 --- a/kicker/menuext/system/systemmenu.h +++ b/kicker/menuext/system/systemmenu.h @@ -27,7 +27,7 @@ class SystemMenu : public KPanelMenu { - Q_OBJECT + TQ_OBJECT public: SystemMenu(TQWidget *parent, const char *name, diff --git a/kicker/menuext/tdeprint/print_mnu.h b/kicker/menuext/tdeprint/print_mnu.h index 47c9e609e..4be9b80a5 100644 --- a/kicker/menuext/tdeprint/print_mnu.h +++ b/kicker/menuext/tdeprint/print_mnu.h @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class PrintMenu : public KPanelMenu, public KPReloadObject { - Q_OBJECT + TQ_OBJECT public: PrintMenu(TQWidget *parent, const char *name, const TQStringList & /*args*/); diff --git a/kicker/menuext/tom/tom.cpp b/kicker/menuext/tom/tom.cpp index 0fa85a1e3..973c52ee9 100644 --- a/kicker/menuext/tom/tom.cpp +++ b/kicker/menuext/tom/tom.cpp @@ -105,7 +105,7 @@ class runMenuWidget : public TQWidget, public QMenuItem l1->setPixmap(foo); runLayout->addWidget(l1);*/ /*TQLabel* l2 = new TQLabel(i18n("&Run: "), this); - l2->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative); + l2->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative); l2->setBuddy(this); runLayout->addWidget(l2);*/ m_runEdit = new KHistoryCombo(this); @@ -116,21 +116,21 @@ class runMenuWidget : public TQWidget, public QMenuItem TQSettings settings; if (settings.readEntry("/TDEStyle/Settings/MenuTransparencyEngine", "Disabled") != "Disabled") { - setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative); - //l1->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative); - //l2->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative); - m_runEdit->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative); + setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative); + //l1->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative); + //l2->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative); + m_runEdit->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative); } else { - /*setBackgroundMode(Qt::NoBackground, Qt::NoBackground); - l1->setBackgroundMode(Qt::NoBackground, Qt::NoBackground); - l2->setBackgroundMode(Qt::NoBackground, Qt::NoBackground); - m_runEdit->setBackgroundMode(Qt::NoBackground, Qt::NoBackground);*/ + /*setBackgroundMode(TQt::NoBackground, TQt::NoBackground); + l1->setBackgroundMode(TQt::NoBackground, TQt::NoBackground); + l2->setBackgroundMode(TQt::NoBackground, TQt::NoBackground); + m_runEdit->setBackgroundMode(TQt::NoBackground, TQt::NoBackground);*/ //l1->setAutoMask(true); - //l1->setBackgroundMode(Qt::NoBackground, Qt::NoBackground); - //l2->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative); - //m_runEdit->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative); + //l1->setBackgroundMode(TQt::NoBackground, TQt::NoBackground); + //l2->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative); + //m_runEdit->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative); } setMinimumHeight(TDEIcon::SizeMedium + 2); @@ -217,7 +217,7 @@ void TOM::initializeRecentDocs() { m_recentDocsMenu->clear(); m_recentDocsMenu->insertItem(SmallIconSet("history_clear"), i18n("Clear History"), - this, TQT_SLOT(clearRecentDocHistory())); + this, TQ_SLOT(clearRecentDocHistory())); m_recentDocsMenu->insertSeparator(); m_recentDocURLs = TDERecentDocument::recentDocuments(); @@ -365,13 +365,13 @@ int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu) return 0; } - connect(taskGroup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(runTask(int))); + connect(taskGroup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(runTask(int))); // so we have an actual task group menu with tasks, let's add it if (inSubMenu) { - TQObject::connect(taskGroup, TQT_SIGNAL(aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*)), - this, TQT_SLOT(contextualizeRMBmenu(TDEPopupMenu*, int, TQPopupMenu*))); + TQObject::connect(taskGroup, TQ_SIGNAL(aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*)), + this, TQ_SLOT(contextualizeRMBmenu(TDEPopupMenu*, int, TQPopupMenu*))); m_submenus.append(taskGroup); @@ -389,7 +389,7 @@ int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu) rmbMenu->insertItem(title, contextMenuTitleID); rmbMenu->insertItem(i18n("Add This Task to Panel")); rmbMenu->insertItem(i18n("Modify This Task...")); - rmbMenu->insertItem(i18n("Remove This Task..."), this, TQT_SLOT(removeTask())); + rmbMenu->insertItem(i18n("Remove This Task..."), this, TQ_SLOT(removeTask())); rmbMenu->insertItem(i18n("Insert New Task...")); } } @@ -432,7 +432,7 @@ void TOM::initialize() } else { - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged())); }*/ // TASKS @@ -486,7 +486,7 @@ void TOM::initialize() } else if (kapp->authorize("run_command")) { - insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand())); + insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQ_SLOT(runCommand())); } // RECENTLY USED ITEMS @@ -494,8 +494,8 @@ void TOM::initialize() m_recentDocsMenu = new TDEPopupMenu(this, "recentDocs"); m_recentDocsMenu->setFont(m_largerFont); - connect(m_recentDocsMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(initializeRecentDocs())); - connect(m_recentDocsMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(openRecentDocument(int))); + connect(m_recentDocsMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(initializeRecentDocs())); + connect(m_recentDocsMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(openRecentDocument(int))); insertItem(DesktopIcon("text-x-generic", TDEIcon::SizeMedium), i18n("Recent Documents"), m_recentDocsMenu); m_submenus.append(m_recentDocsMenu); @@ -512,7 +512,7 @@ void TOM::initialize() // if we have no destinations, put the run command here if (numDests == 0 && kapp->authorize("run_command")) { - insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand())); + insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQ_SLOT(runCommand())); } @@ -564,7 +564,7 @@ void TOM::initialize() } insertItem(DesktopIcon("system-log-out", TDEIcon::SizeMedium), - i18n("Logout %1").arg(username), this, TQT_SLOT(logout())); + i18n("Logout %1").arg(username), this, TQ_SLOT(logout())); } void TOM::reload() @@ -755,7 +755,7 @@ void TOM::paintEvent(TQPaintEvent * e) TQPainter p(this); - style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, + style().drawPrimitive( TQStyle::PE_PanelPopup, &p, TQRect( 0, 0, width(), height() ), colorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0 ) ); diff --git a/kicker/menuext/tom/tom.h b/kicker/menuext/tom/tom.h index b67f2bd6c..7e7b9e5ec 100644 --- a/kicker/menuext/tom/tom.h +++ b/kicker/menuext/tom/tom.h @@ -32,7 +32,7 @@ typedef TQMap<int, KService::Ptr> TaskMap; class TOM : public KPanelMenu { - Q_OBJECT + TQ_OBJECT public: TOM(TQWidget *parent = 0, const char *name = 0); @@ -102,7 +102,7 @@ class TOMFactory : public KLibFactory protected: TQObject* createObject(TQObject *parent = 0, const char *name = 0, - const char *classname = TQOBJECT_OBJECT_NAME_STRING, + const char *classname = "TQObject", const TQStringList& args = TQStringList()); }; diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp index ac2f969d8..daf6312d9 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -197,9 +197,9 @@ void AppletProxy::loadApplet(const TQString& desktopFile, const TQString& config } // connect updateLayout signal - connect(_applet, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout())); + connect(_applet, TQ_SIGNAL(updateLayout()), TQ_SLOT(slotUpdateLayout())); // connect requestFocus signal - connect(_applet, TQT_SIGNAL(requestFocus()), TQT_SLOT(slotRequestFocus())); + connect(_applet, TQ_SIGNAL(requestFocus()), TQ_SLOT(slotRequestFocus())); } KPanelApplet* AppletProxy::loadApplet(const AppletInfo& info) @@ -258,8 +258,8 @@ void AppletProxy::dock(const TQCString& callbackID) DCOPClient* dcop = kapp->dcopClient(); dcop->setNotifications(true); - connect(dcop, TQT_SIGNAL(applicationRemoved(const TQCString&)), - TQT_SLOT(slotApplicationRemoved(const TQCString&))); + connect(dcop, TQ_SIGNAL(applicationRemoved(const TQCString&)), + TQ_SLOT(slotApplicationRemoved(const TQCString&))); WId win; diff --git a/kicker/proxy/appletproxy.h b/kicker/proxy/appletproxy.h index 4c504022f..59fb375b7 100644 --- a/kicker/proxy/appletproxy.h +++ b/kicker/proxy/appletproxy.h @@ -36,7 +36,7 @@ class KickerPluginManager; class AppletProxy : public TQObject, DCOPObject { - Q_OBJECT + TQ_OBJECT public: AppletProxy(TQObject* parent, const char* name = 0); diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp index c210e7b9e..e91d7ac7f 100644 --- a/kicker/proxy/extensiondebugger.cpp +++ b/kicker/proxy/extensiondebugger.cpp @@ -129,7 +129,7 @@ int main( int argc, char ** argv ) ExtensionContainer *container = new ExtensionContainer( extension ); container->show(); - TQObject::connect( &a, TQT_SIGNAL( lastWindowClosed() ), &a, TQT_SLOT( quit() ) ); + TQObject::connect( &a, TQ_SIGNAL( lastWindowClosed() ), &a, TQ_SLOT( quit() ) ); int result = a.exec(); @@ -143,8 +143,8 @@ ExtensionContainer::ExtensionContainer( KPanelExtension *extension, TQWidget *pa ( new TQVBoxLayout( this ) )->setAutoAdd( true ); TQPushButton *configButton = new TQPushButton( i18n( "Configure..." ), this ); - connect( configButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( showPreferences() ) ); + connect( configButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( showPreferences() ) ); m_extension->reparent( this, TQPoint( 0, 0 ) ); } diff --git a/kicker/proxy/extensiondebugger.h b/kicker/proxy/extensiondebugger.h index 0f4719b9f..fd1cba1af 100644 --- a/kicker/proxy/extensiondebugger.h +++ b/kicker/proxy/extensiondebugger.h @@ -29,7 +29,7 @@ class KPanelExtension; class ExtensionContainer : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ExtensionContainer(KPanelExtension *extension, TQWidget* parent = 0, const char* name = 0); diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index 13c40e67b..4168bc14a 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -161,7 +161,7 @@ void ExtensionProxy::loadExtension(const TQCString& desktopFile, const TQCString } // connect updateLayout signal - connect(_extension, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout())); + connect(_extension, TQ_SIGNAL(updateLayout()), TQ_SLOT(slotUpdateLayout())); } KPanelExtension* ExtensionProxy::loadExtension(const AppletInfo& info) @@ -198,8 +198,8 @@ void ExtensionProxy::dock(const TQCString& callbackID) DCOPClient* dcop = kapp->dcopClient(); dcop->setNotifications(true); - connect(dcop, TQT_SIGNAL(applicationRemoved(const TQCString&)), - TQT_SLOT(slotApplicationRemoved(const TQCString&))); + connect(dcop, TQ_SIGNAL(applicationRemoved(const TQCString&)), + TQ_SLOT(slotApplicationRemoved(const TQCString&))); WId win; diff --git a/kicker/proxy/extensionproxy.h b/kicker/proxy/extensionproxy.h index 88bc0a325..d32b8f70b 100644 --- a/kicker/proxy/extensionproxy.h +++ b/kicker/proxy/extensionproxy.h @@ -35,7 +35,7 @@ class KPanelExtension; class ExtensionProxy : public TQObject, DCOPObject { - Q_OBJECT + TQ_OBJECT public: ExtensionProxy(TQObject* parent, const char* name = 0); diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp index 29c06da89..ac0133668 100644 --- a/kicker/taskbar/taskbar.cpp +++ b/kicker/taskbar/taskbar.cpp @@ -49,7 +49,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "taskbar.h" #include "taskbar.moc" -#define READ_MERGED_TASBKAR_SETTING(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->x():m_settingsObject->x()) +#define READ_MERGED_TASKBAR_SETTING(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->x():m_settingsObject->x()) TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettingsObject, TQWidget *parent, const char *name ) : Panner( parent, name ), @@ -81,7 +81,7 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettin // init setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); - m_sortByAppPrev = READ_MERGED_TASBKAR_SETTING(sortByApp); + m_sortByAppPrev = READ_MERGED_TASKBAR_SETTING(sortByApp); // setup animation frames for (int i = 1; i < 11; i++) @@ -92,24 +92,24 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettin // configure configure(); - connect(&m_relayoutTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(reLayout())); + connect(&m_relayoutTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(reLayout())); - connect(this, TQT_SIGNAL(contentsMoving(int, int)), TQT_SLOT(setBackground())); + connect(this, TQ_SIGNAL(contentsMoving(int, int)), TQ_SLOT(setBackground())); // connect manager - connect(TaskManager::the(), TQT_SIGNAL(taskAdded(Task::Ptr)), - this, TQT_SLOT(add(Task::Ptr))); - connect(TaskManager::the(), TQT_SIGNAL(taskRemoved(Task::Ptr)), - this, TQT_SLOT(remove(Task::Ptr))); - connect(TaskManager::the(), TQT_SIGNAL(startupAdded(Startup::Ptr)), - this, TQT_SLOT(add(Startup::Ptr))); - connect(TaskManager::the(), TQT_SIGNAL(startupRemoved(Startup::Ptr)), - this, TQT_SLOT(remove(Startup::Ptr))); - connect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), - this, TQT_SLOT(desktopChanged(int))); - connect(TaskManager::the(), TQT_SIGNAL(windowChanged(Task::Ptr)), - this, TQT_SLOT(windowChanged(Task::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(taskAdded(Task::Ptr)), + this, TQ_SLOT(add(Task::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(taskRemoved(Task::Ptr)), + this, TQ_SLOT(remove(Task::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(startupAdded(Startup::Ptr)), + this, TQ_SLOT(add(Startup::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(startupRemoved(Startup::Ptr)), + this, TQ_SLOT(remove(Startup::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(desktopChanged(int)), + this, TQ_SLOT(desktopChanged(int))); + connect(TaskManager::the(), TQ_SIGNAL(windowChanged(Task::Ptr)), + this, TQ_SLOT(windowChanged(Task::Ptr))); isGrouping = shouldGroup(); @@ -131,8 +131,8 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettin blocklayout = false; - connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); - keys = new TDEGlobalAccel( TQT_TQOBJECT(this) ); + connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); + keys = new TDEGlobalAccel( this ); #include "taskbarbindings.cpp" keys->readSettings(); keys->updateConnections(); @@ -174,31 +174,40 @@ KTextShadowEngine *TaskBar::textShadowEngine() return m_textShadowEngine; } - -TQSize TaskBar::sizeHint() const +int TaskBar::buttonHeight() const { - // get our minimum height based on the minimum button height or the - // height of the font in use, which is largest TQFontMetrics fm(TDEGlobalSettings::taskbarFont()); - int minButtonHeight = fm.height() > READ_MERGED_TASBKAR_SETTING(minimumButtonHeight) ? - fm.height() : READ_MERGED_TASBKAR_SETTING(minimumButtonHeight); + int bh = TQMAX(fm.height(), READ_MERGED_TASKBAR_SETTING(minimumButtonHeight)); + + if(showIcons()) + { + bh = TQMAX(bh, READ_MERGED_TASKBAR_SETTING(iconSize)); + } + + return bh + 2; +} + +int TaskBar::buttonWidth() const +{ + return TQMAX(BUTTON_MIN_WIDTH, READ_MERGED_TASKBAR_SETTING(iconSize)) + 2; +} - return TQSize(BUTTON_MIN_WIDTH, minButtonHeight); + +TQSize TaskBar::sizeHint() const +{ + return TQSize(buttonWidth(), buttonHeight()); } TQSize TaskBar::sizeHint( 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 - TQFontMetrics fm(TDEGlobalSettings::taskbarFont()); - int minButtonHeight = fm.height() > READ_MERGED_TASBKAR_SETTING(minimumButtonHeight) ? - fm.height() : READ_MERGED_TASBKAR_SETTING(minimumButtonHeight); + // get our minimum height based on the minimum button height, the icon size or the + // height of the font in use, whichever is largest if ( p == KPanelExtension::Left || p == KPanelExtension::Right ) { // Vertical layout // Minimum space allows for one icon, the window list button and the up/down scrollers - int minHeight = minButtonHeight*3; + int minHeight = buttonHeight()*3; if (minHeight > maxSize.height()) return maxSize; return TQSize(maxSize.width(), minHeight); @@ -207,7 +216,7 @@ TQSize TaskBar::sizeHint( KPanelExtension::Position p, TQSize maxSize) const { // Horizontal layout // Minimum space allows for one column of icons, the window list button and the left/right scrollers - int min_width=BUTTON_MIN_WIDTH*3; + int min_width=buttonWidth()*3; if (min_width > maxSize.width()) return maxSize; return TQSize(min_width, maxSize.height()); @@ -233,16 +242,18 @@ void TaskBar::configure() bool wasDisplayIconsNText = m_displayIconsNText; bool wasShowOnlyIconified = m_showOnlyIconified; int wasShowTaskStates = m_showTaskStates; + int wasIconSize = m_iconSize; - m_showAllWindows = READ_MERGED_TASBKAR_SETTING(showAllWindows); - m_sortByDesktop = m_showAllWindows && READ_MERGED_TASBKAR_SETTING(sortByDesktop); - m_displayIconsNText = READ_MERGED_TASBKAR_SETTING(displayIconsNText); - m_showOnlyIconified = READ_MERGED_TASBKAR_SETTING(showOnlyIconified); - m_cycleWheel = READ_MERGED_TASBKAR_SETTING(cycleWheel); - m_showTaskStates = READ_MERGED_TASBKAR_SETTING(showTaskStates); + m_showAllWindows = READ_MERGED_TASKBAR_SETTING(showAllWindows); + m_sortByDesktop = m_showAllWindows && READ_MERGED_TASKBAR_SETTING(sortByDesktop); + m_displayIconsNText = READ_MERGED_TASKBAR_SETTING(displayIconsNText); + m_showOnlyIconified = READ_MERGED_TASKBAR_SETTING(showOnlyIconified); + m_cycleWheel = READ_MERGED_TASKBAR_SETTING(cycleWheel); + m_showTaskStates = READ_MERGED_TASKBAR_SETTING(showTaskStates); + m_iconSize = READ_MERGED_TASKBAR_SETTING(iconSize); m_currentScreen = -1; // Show all screens or re-get our screen - m_showOnlyCurrentScreen = (READ_MERGED_TASBKAR_SETTING(showCurrentScreenOnly) && + m_showOnlyCurrentScreen = (READ_MERGED_TASKBAR_SETTING(showCurrentScreenOnly) && TQApplication::desktop()->isVirtualDesktop() && TQApplication::desktop()->numScreens() > 1); @@ -250,12 +261,12 @@ void TaskBar::configure() // are paying attention to the current Xinerama screen // disconnect first in case we've been here before // to avoid multiple connections - disconnect(TaskManager::the(), TQT_SIGNAL(windowChangedGeometry(Task::Ptr)), - this, TQT_SLOT(windowChangedGeometry(Task::Ptr))); + disconnect(TaskManager::the(), TQ_SIGNAL(windowChangedGeometry(Task::Ptr)), + this, TQ_SLOT(windowChangedGeometry(Task::Ptr))); if (m_showOnlyCurrentScreen) { - connect(TaskManager::the(), TQT_SIGNAL(windowChangedGeometry(Task::Ptr)), - this, TQT_SLOT(windowChangedGeometry(Task::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(windowChangedGeometry(Task::Ptr)), + this, TQ_SLOT(windowChangedGeometry(Task::Ptr))); } TaskManager::the()->trackGeometry(m_showOnlyCurrentScreen); @@ -264,7 +275,8 @@ void TaskBar::configure() wasDisplayIconsNText != m_displayIconsNText || wasCycleWheel != m_cycleWheel || wasShowOnlyIconified != m_showOnlyIconified || - wasShowTaskStates != m_showTaskStates) + wasShowTaskStates != m_showTaskStates || + wasIconSize != m_iconSize) { // relevant settings changed, update our task containers for (TaskContainer::Iterator it = containers.begin(); @@ -275,12 +287,12 @@ void TaskBar::configure() } } - if (m_sortByAppPrev != READ_MERGED_TASBKAR_SETTING(sortByApp)) { - m_sortByAppPrev = READ_MERGED_TASBKAR_SETTING(sortByApp); + if (m_sortByAppPrev != READ_MERGED_TASKBAR_SETTING(sortByApp)) { + m_sortByAppPrev = READ_MERGED_TASKBAR_SETTING(sortByApp); reSort(); } - TaskManager::the()->setXCompositeEnabled(READ_MERGED_TASBKAR_SETTING(showThumbnails)); + TaskManager::the()->setXCompositeEnabled(READ_MERGED_TASKBAR_SETTING(showThumbnails)); reLayoutEventually(); } @@ -374,7 +386,7 @@ void TaskBar::add(Startup::Ptr startup) // create new container TaskContainer *container = new TaskContainer(startup, frames, this, m_settingsObject, m_globalSettingsObject, viewport()); m_hiddenContainers.append(container); - connect(container, TQT_SIGNAL(showMe(TaskContainer*)), this, TQT_SLOT(showTaskContainer(TaskContainer*))); + connect(container, TQ_SIGNAL(showMe(TaskContainer*)), this, TQ_SLOT(showTaskContainer(TaskContainer*))); } void TaskBar::reSort() @@ -409,7 +421,7 @@ void TaskBar::showTaskContainer(TaskContainer* container) } // try to place the container after one of the same app - if (READ_MERGED_TASBKAR_SETTING(sortByApp)) + if (READ_MERGED_TASKBAR_SETTING(sortByApp)) { TaskContainer::Iterator it = containers.begin(); for (; it != containers.end(); ++it) @@ -731,14 +743,12 @@ void TaskBar::reLayout() // number of rows simply depends on our height which is either the // minimum button height or the height of the font in use, whichever is // largest - TQFontMetrics fm(TDEGlobalSettings::taskbarFont()); - int minButtonHeight = fm.height() > READ_MERGED_TASBKAR_SETTING(minimumButtonHeight) ? - fm.height() : READ_MERGED_TASBKAR_SETTING(minimumButtonHeight); + int minButtonHeight = buttonHeight(); // horizontal layout - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { - int bwidth=BUTTON_MIN_WIDTH; + int bwidth=buttonWidth(); int rows = contentsRect().height() / minButtonHeight; if (rows<1) rows=1; @@ -752,20 +762,20 @@ void TaskBar::reLayout() int bpr = static_cast<int>(ceil(static_cast<double>(list.count()) / rows)); // adjust content size - if ( contentsRect().width() < bpr * BUTTON_MIN_WIDTH ) + if ( contentsRect().width() < bpr * bwidth ) { - resizeContents( bpr * BUTTON_MIN_WIDTH, contentsRect().height() ); + resizeContents( bpr * bwidth, contentsRect().height() ); } // maximum number of buttons per row - int mbpr = contentsRect().width() / BUTTON_MIN_WIDTH; + int mbpr = contentsRect().width() / bwidth; // expand button width if space permits and the taskbar is not in 'icons only' mode if (mbpr > bpr) { if (!showIcons() || showText()) bwidth = contentsRect().width() / bpr; - int maxWidth = READ_MERGED_TASBKAR_SETTING(maximumButtonWidth); + int maxWidth = READ_MERGED_TASKBAR_SETTING(maximumButtonWidth); if (maxWidth > 0 && bwidth > maxWidth) { bwidth = maxWidth; @@ -844,7 +854,7 @@ void TaskBar::reLayout() } } - TQTimer::singleShot(100, this, TQT_SLOT(publishIconGeometry())); + TQTimer::singleShot(100, this, TQ_SLOT(publishIconGeometry())); } void TaskBar::setViewportBackground() @@ -987,9 +997,7 @@ int TaskBar::taskCount() const int TaskBar::maximumButtonsWithoutShrinking() const { - TQFontMetrics fm(TDEGlobalSettings::taskbarFont()); - int minButtonHeight = fm.height() > READ_MERGED_TASBKAR_SETTING(minimumButtonHeight) ? - fm.height() : READ_MERGED_TASBKAR_SETTING(minimumButtonHeight); + int minButtonHeight = buttonHeight(); int rows = contentsRect().height() / minButtonHeight; if (rows < 1) @@ -997,9 +1005,9 @@ int TaskBar::maximumButtonsWithoutShrinking() const rows = 1; } - if ( orientation() == Qt::Horizontal ) { + if ( orientation() == TQt::Horizontal ) { // maxWidth of 0 means no max width, drop back to default - int maxWidth = READ_MERGED_TASBKAR_SETTING(maximumButtonWidth); + int maxWidth = READ_MERGED_TASKBAR_SETTING(maximumButtonWidth); if (maxWidth == 0) { maxWidth = BUTTON_MAX_WIDTH; @@ -1017,8 +1025,8 @@ int TaskBar::maximumButtonsWithoutShrinking() const bool TaskBar::shouldGroup() const { - return READ_MERGED_TASBKAR_SETTING(groupTasks) == m_settingsObject->GroupAlways || - ((READ_MERGED_TASBKAR_SETTING(groupTasks) == m_settingsObject->GroupWhenFull && + return READ_MERGED_TASKBAR_SETTING(groupTasks) == m_settingsObject->GroupAlways || + ((READ_MERGED_TASKBAR_SETTING(groupTasks) == m_settingsObject->GroupWhenFull && taskCount() > maximumButtonsWithoutShrinking())); } @@ -1166,7 +1174,7 @@ void TaskBar::activateNextTask(bool forward) void TaskBar::wheelEvent(TQWheelEvent* e) { - if(READ_MERGED_TASBKAR_SETTING(cycleWheel)) { + if(READ_MERGED_TASKBAR_SETTING(cycleWheel)) { if (e->delta() > 0) { @@ -1246,7 +1254,7 @@ TQImage* TaskBar::blendGradient(const TQSize& size) void TaskBar::sortContainersByDesktop(TaskContainer::List& list) { - typedef TQValueVector<QPair<int, QPair<int, TaskContainer*> > > SortVector; + typedef TQValueVector<TQPair<int, TQPair<int, TaskContainer*> > > SortVector; SortVector sorted; sorted.resize(list.count()); int i = 0; diff --git a/kicker/taskbar/taskbar.h b/kicker/taskbar/taskbar.h index 0ab614a61..dc34129e0 100644 --- a/kicker/taskbar/taskbar.h +++ b/kicker/taskbar/taskbar.h @@ -70,7 +70,7 @@ namespace TaskMoveDestination class TaskBar : public Panner { - Q_OBJECT + TQ_OBJECT public: TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettingsObject, TQWidget *parent = 0, const char *name = 0 ); @@ -137,37 +137,40 @@ protected: void moveEvent( TQMoveEvent* ); bool idMatch( const TQString& id1, const TQString& id2 ); TaskContainer::List filteredContainers(); + int buttonHeight() const; + int buttonWidth() const; private: void sortContainersByDesktop(TaskContainer::List& list); void setViewportBackground(); - bool blocklayout; - bool m_showAllWindows; - bool m_cycleWheel; - int m_currentScreen; // The screen to show, -1 for all screens - bool m_showOnlyCurrentScreen; - bool m_sortByDesktop; + bool blocklayout; + bool m_showAllWindows; + bool m_cycleWheel; + int m_currentScreen; // The screen to show, -1 for all screens + bool m_showOnlyCurrentScreen; + bool m_sortByDesktop; int m_displayIconsNText; - bool m_showOnlyIconified; - int m_showTaskStates; - ArrowType arrowType; - TaskContainer::List containers; - TaskContainer::List m_hiddenContainers; - TaskContainer::List m_deletableContainers; - PixmapList frames; + bool m_showOnlyIconified; + int m_showTaskStates; + int m_iconSize; + ArrowType arrowType; + TaskContainer::List containers; + TaskContainer::List m_hiddenContainers; + TaskContainer::List m_deletableContainers; + PixmapList frames; int maximumButtonsWithoutShrinking() const; bool shouldGroup() const; bool isGrouping; void reGroup(); TDEGlobalAccel* keys; - KTextShadowEngine* m_textShadowEngine; - bool m_ignoreUpdates; - bool m_sortByAppPrev; - TQTimer m_relayoutTimer; - TQImage m_blendGradient; - TaskBarSettings* m_settingsObject; - TaskBarSettings* m_globalSettingsObject; + KTextShadowEngine* m_textShadowEngine; + bool m_ignoreUpdates; + bool m_sortByAppPrev; + TQTimer m_relayoutTimer; + TQImage m_blendGradient; + TaskBarSettings* m_settingsObject; + TaskBarSettings* m_globalSettingsObject; }; #endif diff --git a/kicker/taskbar/taskbar.kcfg b/kicker/taskbar/taskbar.kcfg index 95596ad34..86ea32dca 100644 --- a/kicker/taskbar/taskbar.kcfg +++ b/kicker/taskbar/taskbar.kcfg @@ -75,9 +75,9 @@ <label>Only Running</label> </choice> </choices> - <default>ShowAll</default> + <default>ShowAll</default> <label>Show tasks with state:</label> - <whatsthis>The taskbar can show and/or hide tasks based on their current process state. Select <em>Any</em> to show all tasks regardless of current state.</whatsthis> + <whatsthis>The taskbar can show and/or hide tasks based on their current process state. Select <em>Any</em> to show all tasks regardless of current state.</whatsthis> </entry> <entry key="SortByDesktop" type="Bool" > <default>true</default> @@ -91,9 +91,10 @@ </entry> <entry key="MaximumButtonWidth" type="Int" > <default>200</default> - <min>0</min> - <label></label> - <whatsthis></whatsthis> + <min>50</min> + <max>500</max> + <label>Maximum button width</label> + <whatsthis>The maximum width to which a taskbar item can expand.</whatsthis> </entry> <entry key="MinimumButtonHeight" type="Int" > <default>18</default> @@ -172,19 +173,20 @@ <label>Draw taskbar entries "flat" and not as a button</label> <whatsthis>Turning this option on will cause the taskbar to draw visible button frames for each entry in the taskbar. By default, this option is off.</whatsthis> </entry> + <entry key="ShowButtonOnHover" type="Bool" > + <default>true</default> + <label>Show a visible button frame on the task the cursor is positioned over</label> + <whatsthis>Turning this option on will cause the taskbar to draw a visible button frame around the item currently under the mouse. By default, this option is on.</whatsthis> + </entry> <entry key="HaloText" type="Bool" > <default>false</default> <label>Draw taskbar text with a halo around it</label> <whatsthis>Turning this option on will cause the taskbar to draw fancier text that has an outline around it. While this is useful for transparent panels or particularly dark panel backgrounds, it is slower.</whatsthis> </entry> - <entry key="ShowButtonOnHover" type="Bool" > - <default>true</default> - <label>Show a visible button frame on the task the cursor is positioned over</label> - </entry> <entry key="ShowThumbnails" type="Bool" > <default>false</default> <label>Show thumbnails instead of icons in the mouse-over effects</label> - <whatsthis>Enabling this option will draw a thumbnail of the window in its mouse-over effect.<p>If a window is minimized or resides on a different desktop while the taskbar is starting, an icon is shown until the window is restored or the appropriate desktop is activated, respectively.</p></whatsthis> + <whatsthis>Enabling this option will draw a thumbnail of the window in its mouse-over effect.<p>If a window is minimized or resides on a different desktop while the taskbar is starting, an icon is shown until the window is restored or the appropriate desktop is activated, respectively. This options needs a TWin compositor in order to work.</p></whatsthis> </entry> <entry key="ThumbnailMaxDimension" type="UInt" > <default>100</default> @@ -198,18 +200,21 @@ </entry> <entry name="ActiveTaskTextColor" type="Color" > <label>Color to use for active task button text</label> - <default code="true">QColor()</default> + <default code="true">TQColor()</default> <whatsthis>This color is used for displaying text on taskbar button for task which is active at the moment.</whatsthis> </entry> <entry name="InactiveTaskTextColor" type="Color" > <label>Color to use for inactive tasks button text</label> - <default code="true">QColor()</default> + <default code="true">TQColor()</default> <whatsthis>This color is used for displaying text on taskbar button for tasks other than active.</whatsthis> </entry> <entry name="TaskBackgroundColor" type="Color" > <label>Color to use for taskbar buttons background</label> - <default code="true">QColor()</default> + <default code="true">TQColor()</default> <whatsthis>This color is used for displaying background of taskbar buttons.</whatsthis> </entry> + <entry name="IconSize" type="UInt" > + <default>16</default> + </entry> </group> </kcfg> diff --git a/kicker/taskbar/taskbarbindings.cpp b/kicker/taskbar/taskbarbindings.cpp index 364faac97..f604e3bc6 100644 --- a/kicker/taskbar/taskbarbindings.cpp +++ b/kicker/taskbar/taskbarbindings.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef NOSLOTS # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, fnSlot ) \ keys->insert( name, i18n(name), TQString(), key3, key4 ) diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp index a891cf64e..efde7dd2c 100644 --- a/kicker/taskbar/taskbarcontainer.cpp +++ b/kicker/taskbar/taskbarcontainer.cpp @@ -99,7 +99,7 @@ TaskBarContainer::TaskBarContainer( bool enableFrame, TQString configFileOverrid taskBar = new TaskBar(settingsObject, globalSettingsObject, this); layout->addWidget( taskBar ); - connect( taskBar, TQT_SIGNAL( containerCountChanged() ), TQT_SIGNAL( containerCountChanged() ) ); + connect( taskBar, TQ_SIGNAL( containerCountChanged() ), TQ_SIGNAL( containerCountChanged() ) ); setBackground(); @@ -134,10 +134,10 @@ void TaskBarContainer::configure() // window list button windowListButton = new SimpleButton(this); windowListMenu= new KWindowListMenu; - connect(windowListButton, TQT_SIGNAL(pressed()), - TQT_SLOT(showWindowListMenu())); - connect(windowListMenu, TQT_SIGNAL(aboutToHide()), - TQT_SLOT(windowListMenuAboutToHide())); + connect(windowListButton, TQ_SIGNAL(pressed()), + TQ_SLOT(showWindowListMenu())); + connect(windowListMenu, TQ_SIGNAL(aboutToHide()), + TQ_SLOT(windowListMenuAboutToHide())); // geometry TQString icon; @@ -207,7 +207,7 @@ void TaskBarContainer::preferences() void TaskBarContainer::orientationChange(Orientation o) { - if (o == Qt::Horizontal) + if (o == TQt::Horizontal) { if (windowListButton) { @@ -299,9 +299,9 @@ void TaskBarContainer::showWindowListMenu() break; } - disconnect( windowListButton, TQT_SIGNAL( pressed() ), this, TQT_SLOT( showWindowListMenu() ) ); + disconnect( windowListButton, TQ_SIGNAL( pressed() ), this, TQ_SLOT( showWindowListMenu() ) ); windowListMenu->exec( pos ); - TQTimer::singleShot(100, this, TQT_SLOT(reconnectWindowListButton())); + TQTimer::singleShot(100, this, TQ_SLOT(reconnectWindowListButton())); } void TaskBarContainer::windowListMenuAboutToHide() @@ -313,7 +313,7 @@ void TaskBarContainer::windowListMenuAboutToHide() void TaskBarContainer::reconnectWindowListButton() { - connect( windowListButton, TQT_SIGNAL( pressed() ), TQT_SLOT( showWindowListMenu() ) ); + connect( windowListButton, TQ_SIGNAL( pressed() ), TQ_SLOT( showWindowListMenu() ) ); } TQSize TaskBarContainer::sizeHint( KPanelExtension::Position p, TQSize maxSize) const diff --git a/kicker/taskbar/taskbarcontainer.h b/kicker/taskbar/taskbarcontainer.h index 7fc13241f..a8b078d67 100644 --- a/kicker/taskbar/taskbarcontainer.h +++ b/kicker/taskbar/taskbarcontainer.h @@ -38,7 +38,7 @@ class TaskBarSettings; class KDE_EXPORT TaskBarContainer : public TQFrame, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index cc533f0b9..5a8464cd5 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/kicker/taskbar/taskcontainer.cpp @@ -26,6 +26,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <assert.h> +#ifdef Q_OS_SOLARIS +#include <procfs.h> +#endif /* SunOS */ + #include <tqbitmap.h> #include <tqcolor.h> #include <tqcursor.h> @@ -45,7 +49,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kiconloader.h> #include <kimageeffect.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> #include <netwm.h> #include <fixx11h.h> @@ -62,8 +66,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "taskcontainer.h" #include "taskcontainer.moc" -#define READ_MERGED_TASBKAR_SETTING(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->x():m_settingsObject->x()) -#define READ_MERGED_TASBKAR_ACTION(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->action(x):m_settingsObject->action(x)) +#define READ_MERGED_TASKBAR_SETTING(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->x():m_settingsObject->x()) +#define READ_MERGED_TASKBAR_ACTION(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->action(x):m_settingsObject->action(x)) static Bool netwm_atoms_created = False; static Atom net_wm_pid = 0; @@ -96,6 +100,18 @@ static void create_atoms(Display *d) { } bool is_process_resumable(pid_t pid) { +#ifdef Q_OS_SOLARIS + TQFile procStatFile(TQString("/proc/%1/lwp/1/lwpsinfo").arg(pid)); + if (procStatFile.open(IO_ReadOnly)) { + TQByteArray statRaw = procStatFile.readAll(); + lwpsinfo_t *inf = (lwpsinfo_t *)statRaw.data(); + + procStatFile.close(); + if( inf->pr_sname == 'T' ) { + return true; + } + } +#else /* default */ TQFile procStatFile(TQString("/proc/%1/stat").arg(pid)); if (procStatFile.open(IO_ReadOnly)) { TQByteArray statRaw = procStatFile.readAll(); @@ -107,13 +123,9 @@ bool is_process_resumable(pid_t pid) { if( state == "T" ) { return true; } - else { - return false; - } - } - else { - return false; } +#endif /* read process status */ + return false; } TaskContainer::TaskContainer(Task::Ptr task, TaskBar* bar, TaskBarSettings* settingsObject, TaskBarSettings* globalSettingsObject, TQWidget *parent, const char *name) @@ -174,7 +186,7 @@ TaskContainer::TaskContainer(Startup::Ptr startup, PixmapList& startupFrames, Ta sid = m_startup->bin(); - connect(m_startup, TQT_SIGNAL(changed()), TQT_SLOT(update())); + connect(m_startup, TQ_SIGNAL(changed()), TQ_SLOT(update())); dragSwitchTimer.start(333, true); } @@ -192,16 +204,18 @@ void TaskContainer::init() if (!netwm_atoms_created) create_atoms(TQPaintDevice::x11AppDisplay()); + int iconSize = READ_MERGED_TASKBAR_SETTING(iconSize); + setWFlags(TQt::WNoAutoErase); setBackgroundMode(NoBackground); - animBg = TQPixmap(16, 16); + animBg = TQPixmap(iconSize, iconSize); installEventFilter(KickerTip::the()); - connect(&animationTimer, TQT_SIGNAL(timeout()), TQT_SLOT(animationTimerFired())); - connect(&dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(showMe())); - connect(&attentionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(attentionTimerFired())); - connect(&m_paintEventCompressionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateNow())); + connect(&animationTimer, TQ_SIGNAL(timeout()), TQ_SLOT(animationTimerFired())); + connect(&dragSwitchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(showMe())); + connect(&attentionTimer, TQ_SIGNAL(timeout()), TQ_SLOT(attentionTimerFired())); + connect(&m_paintEventCompressionTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateNow())); } TaskContainer::~TaskContainer() @@ -221,8 +235,8 @@ void TaskContainer::showMe() animationTimer.start(100); emit showMe(this); - disconnect(&dragSwitchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(showMe())); - connect(&dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(dragSwitch())); + disconnect(&dragSwitchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(showMe())); + connect(&dragSwitchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(dragSwitch())); } void TaskContainer::stopTimers() @@ -242,7 +256,7 @@ void TaskContainer::taskChanged(bool geometryOnlyChange) return; } - const TQObject* source = TQT_TQOBJECT_CONST(sender()); + const TQObject* source = sender(); Task::Ptr task = 0; Task::List::const_iterator itEnd = tasks.constEnd(); for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it) @@ -265,7 +279,7 @@ void TaskContainer::taskChanged(bool geometryOnlyChange) void TaskContainer::iconChanged() { - const TQObject* source = TQT_TQOBJECT_CONST(sender()); + const TQObject* source = sender(); Task::Ptr task = 0; Task::List::const_iterator itEnd = tasks.constEnd(); for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it) @@ -366,11 +380,11 @@ void TaskContainer::checkAttention(const Task::Ptr t) void TaskContainer::attentionTimerFired() { assert( attentionState != -1 ); - if (attentionState < READ_MERGED_TASBKAR_SETTING(attentionBlinkIterations)*2) + if (attentionState < READ_MERGED_TASKBAR_SETTING(attentionBlinkIterations)*2) { ++attentionState; } - else if (READ_MERGED_TASBKAR_SETTING(attentionBlinkIterations) < 1000) + else if (READ_MERGED_TASKBAR_SETTING(attentionBlinkIterations) < 1000) { attentionTimer.stop(); } @@ -390,9 +404,22 @@ TQSizePolicy TaskContainer::sizePolicy() const void TaskContainer::resizeEvent( TQResizeEvent * ) { - // calculate the icon rect - TQRect br( style().subRect( TQStyle::SR_PushButtonContents, this ) ); - iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this ); + recalculateIconRect(); +} + +void TaskContainer::recalculateIconRect() +{ + iconSize = READ_MERGED_TASKBAR_SETTING(iconSize); + + if(taskBar->showText()) + { + TQRect br( style().subRect( TQStyle::SR_PushButtonContents, this ) ); + iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - iconSize) / 2, iconSize, iconSize), this ); + } + else + { + iconRect = TQStyle::visualRect( TQRect((width() - iconSize) / 2, (height() - iconSize) / 2, iconSize, iconSize), this ); + } } void TaskContainer::add(Task::Ptr task) @@ -415,9 +442,9 @@ void TaskContainer::add(Task::Ptr task) KickerTip::Client::updateKickerTip(); update(); - connect(task, TQT_SIGNAL(changed(bool)), TQT_SLOT(taskChanged(bool))); - connect(task, TQT_SIGNAL(iconChanged()), TQT_SLOT(iconChanged())); - connect(task, TQT_SIGNAL(activated()), TQT_SLOT(setLastActivated())); + connect(task, TQ_SIGNAL(changed(bool)), TQ_SLOT(taskChanged(bool))); + connect(task, TQ_SIGNAL(iconChanged()), TQ_SLOT(iconChanged())); + connect(task, TQ_SIGNAL(activated()), TQ_SLOT(setLastActivated())); } void TaskContainer::remove(Task::Ptr task) @@ -581,13 +608,14 @@ void TaskContainer::drawButton(TQPainter *p) TQPixmap *pm((TQPixmap*)p->device()); TQPixmap pixmap; // icon Task::Ptr task = 0; - bool iconified = !READ_MERGED_TASBKAR_SETTING(showOnlyIconified); - bool halo = READ_MERGED_TASBKAR_SETTING(haloText); - bool alwaysDrawButtons = READ_MERGED_TASBKAR_SETTING(drawButtons); + bool iconified = !READ_MERGED_TASKBAR_SETTING(showOnlyIconified); + bool halo = READ_MERGED_TASKBAR_SETTING(haloText); + bool alwaysDrawButtons = READ_MERGED_TASKBAR_SETTING(drawButtons); bool drawButton = alwaysDrawButtons || (m_mouseOver && !halo && isEnabled() && - READ_MERGED_TASBKAR_SETTING(showButtonOnHover)); + READ_MERGED_TASKBAR_SETTING(showButtonOnHover)); TQFont font(TDEGlobalSettings::taskbarFont()); + recalculateIconRect(); // draw sunken if we contain the active task bool active = false; @@ -608,7 +636,7 @@ void TaskContainer::drawButton(TQPainter *p) if (task->demandsAttention()) { - demandsAttention = attentionState == READ_MERGED_TASBKAR_SETTING(attentionBlinkIterations) || + demandsAttention = attentionState == READ_MERGED_TASKBAR_SETTING(attentionBlinkIterations) || attentionState % 2 == 0; } } @@ -616,15 +644,15 @@ void TaskContainer::drawButton(TQPainter *p) font.setBold(active); TQColorGroup colors = palette().active(); - - if (READ_MERGED_TASBKAR_SETTING(useCustomColors)) + + if (READ_MERGED_TASKBAR_SETTING(useCustomColors)) { - colors.setColor( TQColorGroup::Button, READ_MERGED_TASBKAR_SETTING(taskBackgroundColor)); - colors.setColor( TQColorGroup::Background, READ_MERGED_TASBKAR_SETTING(taskBackgroundColor) ); - colors.setColor( TQColorGroup::ButtonText, READ_MERGED_TASBKAR_SETTING(inactiveTaskTextColor) ); - colors.setColor( TQColorGroup::Text, READ_MERGED_TASBKAR_SETTING(inactiveTaskTextColor) ); + colors.setColor( TQColorGroup::Button, READ_MERGED_TASKBAR_SETTING(taskBackgroundColor)); + colors.setColor( TQColorGroup::Background, READ_MERGED_TASKBAR_SETTING(taskBackgroundColor) ); + colors.setColor( TQColorGroup::ButtonText, READ_MERGED_TASKBAR_SETTING(inactiveTaskTextColor) ); + colors.setColor( TQColorGroup::Text, READ_MERGED_TASKBAR_SETTING(inactiveTaskTextColor) ); } - + if (demandsAttention) { if (!drawButton) @@ -638,7 +666,7 @@ void TaskContainer::drawButton(TQPainter *p) for (int i = 0; i < 2; ++i) { line = KickerLib::blendColors(line, colors.background()); - p->setPen(TQPen(line, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); + p->setPen(TQPen(line, 1, TQt::SolidLine, TQt::RoundCap, TQt::RoundJoin)); r.addCoords(-1, -1, 1, 1); p->drawRect(r); } @@ -659,7 +687,7 @@ void TaskContainer::drawButton(TQPainter *p) // get the task icon if (task) { - pixmap = task->pixmap(); + pixmap = task->icon(iconSize, iconSize, true); } bool sunken = isDown() || (alwaysDrawButtons && (active || aboutToActivate)); @@ -671,13 +699,13 @@ void TaskContainer::drawButton(TQPainter *p) // draw button background if (drawButton) { - if (READ_MERGED_TASBKAR_SETTING(drawButtons) && KickerSettings::showDeepButtons()) { - style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, + if (READ_MERGED_TASKBAR_SETTING(drawButtons) && KickerSettings::showDeepButtons()) { + style().drawPrimitive(TQStyle::PE_ButtonBevel, p, TQRect(1, 1, width()-3, height()-2), colors, sunken ? TQStyle::Style_On : TQStyle::Style_Raised); } else { - style().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, + style().drawPrimitive(TQStyle::PE_ButtonTool, p, TQRect(1, 1, width()-2, height()-2), colors, sunken ? TQStyle::Style_Down : TQStyle::Style_Raised); } @@ -690,21 +718,21 @@ void TaskContainer::drawButton(TQPainter *p) } TQString text = name(); // find text - int textPos = ( taskBar->showIcons() && (!pixmap.isNull() || m_startup)) ? 2 + 16 + 2 : 0; + int textPos = ( taskBar->showIcons() && (!pixmap.isNull() || m_startup)) ? 2 + iconSize + 2 : 0; // show icons if (taskBar->showIcons()) { if (pixmap.isNull() && m_startup) - pixmap = SmallIcon(m_startup->icon()); + pixmap = kapp->iconLoader()->loadIcon(m_startup->icon(), TDEIcon::Panel, iconSize); if ( !pixmap.isNull() ) { - // make sure it is no larger than 16x16 - if ( pixmap.width() > 16 || pixmap.height() > 16 ) + // make sure it is no larger than icon size + if ( pixmap.width() > iconSize || pixmap.height() > iconSize ) { TQImage tmp = pixmap.convertToImage(); - pixmap.convertFromImage( tmp.smoothScale( 16, 16 ) ); + pixmap.convertFromImage( tmp.smoothScale( iconSize, iconSize ) ); } // fade out the icon when minimized @@ -718,28 +746,36 @@ void TaskContainer::drawButton(TQPainter *p) } // modified overlay icon - if (taskBar->showText()) + static TQString modStr = "[" + i18n( "modified" ) + "]"; + int modStrPos = text.find( modStr ); + if (modStrPos >= 0) { - static TQString modStr = "[" + i18n( "modified" ) + "]"; - int modStrPos = text.find( modStr ); - if (modStrPos >= 0) + TQRect r; + TQPixmap modPixmap = SmallIcon("modified"); + if (iconified) { - // +1 because we include a space after the closing brace. - text.remove(modStrPos, modStr.length() + 1); - TQPixmap modPixmap = SmallIcon("modified"); + TDEIconEffect::semiTransparent(modPixmap); + } - // draw modified overlay - if (!modPixmap.isNull()) - { - TQRect r = TQStyle::visualRect(TQRect(br.x() + textPos,(height() - 16) / 2, 16, 16), this); - if (iconified) + if (taskBar->showText()) // has text + { + // +1 because we include a space after the closing brace. + text.remove(modStrPos, modStr.length() + 1); + + // draw modified overlay + if (!modPixmap.isNull()) { - TDEIconEffect::semiTransparent(modPixmap); + r = TQStyle::visualRect(TQRect(br.x() + textPos,(height() - iconSize) / 2, iconSize, iconSize), this); + textPos += iconSize + 2; } - p->drawPixmap(r, modPixmap); - textPos += 16 + 2; - } - } + } + else if (taskBar->showIcons()) // has only icon + { + r = TQRect(0, 0, iconSize / 2, iconSize / 2); + r.moveBottomRight(iconRect.bottomRight()); + } + + p->drawPixmap(r, modPixmap); } } @@ -765,9 +801,9 @@ void TaskContainer::drawButton(TQPainter *p) } else // hack for the dotNET style and others { - if (READ_MERGED_TASBKAR_SETTING(useCustomColors)) + if (READ_MERGED_TASKBAR_SETTING(useCustomColors)) { - textPen = TQPen(READ_MERGED_TASBKAR_SETTING(activeTaskTextColor)); + textPen = TQPen(READ_MERGED_TASKBAR_SETTING(activeTaskTextColor)); } else { @@ -775,7 +811,7 @@ void TaskContainer::drawButton(TQPainter *p) } } - int availableWidth = width() - (br.x() * 2) - textPos - 2 - (READ_MERGED_TASBKAR_SETTING(drawButtons) && KickerSettings::showDeepButtons())?2:0; + int availableWidth = width() - (br.x() * 2) - textPos - 2 - (READ_MERGED_TASKBAR_SETTING(drawButtons) && KickerSettings::showDeepButtons())?2:0; if (m_filteredTasks.count() > 1) { availableWidth -= 8; @@ -852,16 +888,16 @@ void TaskContainer::drawButton(TQPainter *p) } // draw popup arrow - if ((m_filteredTasks.count() > 1) && (!(READ_MERGED_TASBKAR_SETTING(drawButtons) && KickerSettings::showDeepButtons()))) + if ((m_filteredTasks.count() > 1) && (!(READ_MERGED_TASKBAR_SETTING(drawButtons) && KickerSettings::showDeepButtons()))) { TQStyle::PrimitiveElement e = TQStyle::PE_ArrowLeft; switch (arrowType) { - case Qt::LeftArrow: e = TQStyle::PE_ArrowLeft; break; - case Qt::RightArrow: e = TQStyle::PE_ArrowRight; break; - case Qt::UpArrow: e = TQStyle::PE_ArrowUp; break; - case Qt::DownArrow: e = TQStyle::PE_ArrowDown; break; + case TQt::LeftArrow: e = TQStyle::PE_ArrowLeft; break; + case TQt::RightArrow: e = TQStyle::PE_ArrowRight; break; + case TQt::UpArrow: e = TQStyle::PE_ArrowUp; break; + case TQt::DownArrow: e = TQStyle::PE_ArrowDown; break; } int flags = TQStyle::Style_Enabled; @@ -872,7 +908,7 @@ void TaskContainer::drawButton(TQPainter *p) flags |= TQStyle::Style_Down; } - style().tqdrawPrimitive(e, p, ar, colors, flags); + style().drawPrimitive(e, p, ar, colors, flags); } // draw mouse over frame in transparent mode @@ -979,7 +1015,7 @@ void TaskContainer::mousePressEvent( TQMouseEvent* e ) return; } - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { m_dragStartPos = e->pos(); } @@ -994,15 +1030,15 @@ void TaskContainer::mousePressEvent( TQMouseEvent* e ) // Other actions will be handled in mouseReleaseEvent switch (e->button()) { - case Qt::LeftButton: - buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->LeftButton); + case TQt::LeftButton: + buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->LeftButton); break; - case Qt::MidButton: - buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->MiddleButton); + case TQt::MidButton: + buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->MiddleButton); break; - case Qt::RightButton: + case TQt::RightButton: default: - buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->RightButton); + buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->RightButton); break; } @@ -1018,14 +1054,14 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e) { m_dragStartPos = TQPoint(); - if (!READ_MERGED_TASBKAR_SETTING(drawButtons)) + if (!READ_MERGED_TASKBAR_SETTING(drawButtons)) { setDown(false); } // This is to avoid the flicker caused by redrawing the // button as unpressed just before it's activated. - if (!TQT_TQRECT_OBJECT(rect()).contains(e->pos())) + if (!rect().contains(e->pos())) { TQToolButton::mouseReleaseEvent(e); return; @@ -1035,15 +1071,15 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e) switch (e->button()) { - case Qt::LeftButton: - buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->LeftButton); + case TQt::LeftButton: + buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->LeftButton); break; - case Qt::MidButton: - buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->MiddleButton); + case TQt::MidButton: + buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->MiddleButton); break; - case Qt::RightButton: + case TQt::RightButton: default: - buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->RightButton); + buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->RightButton); break; } @@ -1061,7 +1097,7 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e) } performAction( buttonAction ); - TQTimer::singleShot(0, this, TQT_SLOT(update())); + TQTimer::singleShot(0, this, TQ_SLOT(update())); } void TaskContainer::performAction(int action) @@ -1223,7 +1259,7 @@ void TaskContainer::popupMenu(int action) return; } - m_menu = new TaskRMBMenu(m_filteredTasks, taskBar->showAllWindows(), (READ_MERGED_TASBKAR_SETTING(allowDragAndDropReArrange))?makeTaskMoveMenu():NULL); + m_menu = new TaskRMBMenu(m_filteredTasks, taskBar->showAllWindows(), (READ_MERGED_TASKBAR_SETTING(allowDragAndDropReArrange))?makeTaskMoveMenu():NULL); } else { @@ -1274,22 +1310,22 @@ TQPopupMenu* TaskContainer::makeTaskMoveMenu() id = menu->insertItem(SmallIconSet("go-first"), i18n("Move to Beginning"), - this, TQT_SLOT(slotTaskMoveBeginning())); + this, TQ_SLOT(slotTaskMoveBeginning())); menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Left)); id = menu->insertItem(SmallIconSet("back"), i18n("Move Left"), - this, TQT_SLOT(slotTaskMoveLeft())); + this, TQ_SLOT(slotTaskMoveLeft())); menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Left)); id = menu->insertItem(SmallIconSet("forward"), i18n("Move Right"), - this, TQT_SLOT(slotTaskMoveRight())); + this, TQ_SLOT(slotTaskMoveRight())); menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Right)); id = menu->insertItem(SmallIconSet("go-last"), i18n("Move to End"), - this, TQT_SLOT(slotTaskMoveEnd())); + this, TQ_SLOT(slotTaskMoveEnd())); menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Right)); return menu; @@ -1328,11 +1364,6 @@ void TaskContainer::mouseMoveEvent( TQMouseEvent* e ) bool TaskContainer::startDrag(const TQPoint& pos) { - if (m_filteredTasks.count() != 1) - { - return false; - } - int delay = TDEGlobalSettings::dndEventDelay(); if ((m_dragStartPos - pos).manhattanLength() > delay) @@ -1375,7 +1406,7 @@ bool TaskContainer::eventFilter(TQObject *o, TQEvent *e) if ( TQApplication::widgetAt( p, true ) == this ) { if (me->type() == TQEvent::MouseButtonPress && - me->button() == Qt::LeftButton) + me->button() == TQt::LeftButton) { m_dragStartPos = mapFromGlobal(p); } @@ -1393,10 +1424,10 @@ bool TaskContainer::eventFilter(TQObject *o, TQEvent *e) { if (!m_dragStartPos.isNull()) { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); TQPoint p(me->globalPos()); - if (me->state() & Qt::LeftButton && + if (me->state() & TQt::LeftButton && TQApplication::widgetAt(p, true) == this) { kdDebug() << "event move" << endl; @@ -1452,7 +1483,7 @@ void TaskContainer::dragEnterEvent( TQDragEnterEvent* e ) return; } - if (e->source() && (e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASBKAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASBKAR_SETTING(sortByApp))) + if (e->source() && (e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASKBAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASKBAR_SETTING(sortByApp))) { e->accept(); } @@ -1480,7 +1511,7 @@ void TaskContainer::dropEvent( TQDropEvent* e ) return; } - if ((e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASBKAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASBKAR_SETTING(sortByApp))) + if ((e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASKBAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASKBAR_SETTING(sortByApp))) { if (taskBar->taskMoveHandler(TaskMoveDestination::Position, TaskDrag::decode(e), TQWidget::mapTo(taskBar, e->pos()))) { e->accept(); @@ -1631,10 +1662,10 @@ void TaskContainer::updateFilteredTaskList() { Task::Ptr t = *it; if ((taskBar->showAllWindows() || t->isOnCurrentDesktop()) && - (!READ_MERGED_TASBKAR_SETTING(showOnlyIconified) || t->isIconified())) + (!READ_MERGED_TASKBAR_SETTING(showOnlyIconified) || t->isIconified())) { pid_t pid = 0; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 Atom type_ret; int format_ret; unsigned long nitems_ret = 0, unused = 0; @@ -1652,15 +1683,15 @@ void TaskContainer::updateFilteredTaskList() if (pid < 0) { m_filteredTasks.append(t); } - else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) != m_settingsObject->ShowAll) { + else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) != m_settingsObject->ShowAll) { if (is_process_resumable(pid)) { - if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowAll) { + if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowAll) { m_filteredTasks.append(t); } - else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowStopped) { + else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowStopped) { m_filteredTasks.append(t); } - else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowRunning) { + else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowRunning) { t->publishIconGeometry( TQRect()); } else { @@ -1668,13 +1699,13 @@ void TaskContainer::updateFilteredTaskList() } } else { - if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowAll) { + if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowAll) { m_filteredTasks.append(t); } - else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowStopped) { + else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowStopped) { t->publishIconGeometry( TQRect()); } - else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowRunning) { + else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowRunning) { m_filteredTasks.append(t); } else { @@ -1695,7 +1726,7 @@ void TaskContainer::updateFilteredTaskList() // sort container list by desktop if (taskBar->sortByDesktop() && m_filteredTasks.count() > 1) { - TQValueVector<QPair<int, Task::Ptr> > sorted; + TQValueVector<TQPair<int, Task::Ptr> > sorted; sorted.resize(m_filteredTasks.count()); int i = 0; @@ -1710,7 +1741,7 @@ void TaskContainer::updateFilteredTaskList() qHeapSort(sorted); m_filteredTasks.clear(); - for (TQValueVector<QPair<int, Task::Ptr> >::iterator it = sorted.begin(); + for (TQValueVector<TQPair<int, Task::Ptr> >::iterator it = sorted.begin(); it != sorted.end(); ++it) { @@ -1742,6 +1773,8 @@ void TaskContainer::settingsChanged() void TaskContainer::updateKickerTip(KickerTip::Data& data) { + int iconSize = READ_MERGED_TASKBAR_SETTING(iconSize); + if (m_startup) { data.message = m_startup->text(); @@ -1749,7 +1782,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) data.subtext = i18n("Loading application ..."); data.icon = TDEGlobal::iconLoader()->loadIcon(m_startup->icon(), TDEIcon::Small, - TDEIcon::SizeMedium, + iconSize, TDEIcon::DefaultState, 0, true); return; @@ -1761,21 +1794,18 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) if (m_filteredTasks.count() > 0) { - if (READ_MERGED_TASBKAR_SETTING(showThumbnails) && + if (READ_MERGED_TASKBAR_SETTING(showThumbnails) && m_filteredTasks.count() == 1) { Task::Ptr t = m_filteredTasks.first(); - pixmap = t->thumbnail(READ_MERGED_TASBKAR_SETTING(thumbnailMaxDimension)); + pixmap = t->thumbnail(READ_MERGED_TASKBAR_SETTING(thumbnailMaxDimension)); } if (pixmap.isNull() && tasks.count()) { // try to load icon via net_wm - pixmap = KWin::icon(tasks.last()->window(), - TDEIcon::SizeMedium, - TDEIcon::SizeMedium, - true); + pixmap = KWin::icon(tasks.last()->window(), iconSize, iconSize, true); } // Collect all desktops the tasks are on. Sort naturally. @@ -1809,7 +1839,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) } } - if (READ_MERGED_TASBKAR_SETTING(showAllWindows) && KWin::numberOfDesktops() > 1) + if (READ_MERGED_TASKBAR_SETTING(showAllWindows) && KWin::numberOfDesktops() > 1) { if (desktopMap.isEmpty()) { diff --git a/kicker/taskbar/taskcontainer.h b/kicker/taskbar/taskcontainer.h index edaf337b4..0ae864185 100644 --- a/kicker/taskbar/taskcontainer.h +++ b/kicker/taskbar/taskcontainer.h @@ -39,7 +39,7 @@ typedef TQValueList<TQPixmap*> PixmapList; class TaskContainer : public TQToolButton, public KickerTip::Client { - Q_OBJECT + TQ_OBJECT public: typedef TQValueList<TaskContainer*> List; @@ -117,6 +117,8 @@ protected: void popupMenu(int); void updateFilteredTaskList(); + void updateIconSize(); + void recalculateIconRect(); protected slots: void animationTimerFired(); @@ -144,6 +146,7 @@ private: PixmapList frames; int attentionState; TQRect iconRect; + int iconSize; TQPixmap animBg; Task::List tasks; Task::List m_filteredTasks; diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp index 1be54ca8b..79c809e39 100644 --- a/kicker/taskmanager/tasklmbmenu.cpp +++ b/kicker/taskmanager/tasklmbmenu.cpp @@ -99,7 +99,7 @@ TaskLMBMenu::TaskLMBMenu(const Task::List& tasks, TQWidget *parent, const char * setAcceptDrops(true); // Always enabled to activate task during drag&drop. m_dragSwitchTimer = new TQTimer(this, "DragSwitchTimer"); - connect(m_dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(dragSwitch())); + connect(m_dragSwitchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(dragSwitch())); } void TaskLMBMenu::fillMenu() @@ -118,7 +118,7 @@ void TaskLMBMenu::fillMenu() t->isIconified(), t->demandsAttention()); int id = insertItem(TQIconSet(t->pixmap()), menuItem); - connectItem(id, t, TQT_SLOT(activateRaiseOrIconify())); + connectItem(id, t, TQ_SLOT(activateRaiseOrIconify())); setItemChecked(id, t->isActive()); if (t->demandsAttention()) @@ -131,7 +131,7 @@ void TaskLMBMenu::fillMenu() if (m_attentionState) { m_attentionTimer = new TQTimer(this, "AttentionTimer"); - connect(m_attentionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(attentionTimeout())); + connect(m_attentionTimer, TQ_SIGNAL(timeout()), TQ_SLOT(attentionTimeout())); m_attentionTimer->start(500, true); } } @@ -229,7 +229,7 @@ void TaskLMBMenu::dragSwitch() void TaskLMBMenu::mousePressEvent( TQMouseEvent* e ) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { m_dragStartPos = e->pos(); } diff --git a/kicker/taskmanager/tasklmbmenu.h b/kicker/taskmanager/tasklmbmenu.h index 7eedc115b..4c20819b6 100644 --- a/kicker/taskmanager/tasklmbmenu.h +++ b/kicker/taskmanager/tasklmbmenu.h @@ -53,7 +53,7 @@ private: class KDE_EXPORT TaskLMBMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: TaskLMBMenu(const Task::List& list, TQWidget *parent = 0, const char *name = 0); diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp index 33df1ddd6..54bf6d919 100644 --- a/kicker/taskmanager/taskmanager.cpp +++ b/kicker/taskmanager/taskmanager.cpp @@ -61,16 +61,16 @@ TaskManager::TaskManager() m_trackGeometry(false) { TDEGlobal::locale()->insertCatalogue("libtaskmanager"); - connect(m_winModule, TQT_SIGNAL(windowAdded(WId)), - this, TQT_SLOT(windowAdded(WId))); - connect(m_winModule, TQT_SIGNAL(windowRemoved(WId)), - this, TQT_SLOT(windowRemoved(WId))); - connect(m_winModule, TQT_SIGNAL(activeWindowChanged(WId)), - this, TQT_SLOT(activeWindowChanged(WId))); - connect(m_winModule, TQT_SIGNAL(currentDesktopChanged(int)), - this, TQT_SLOT(currentDesktopChanged(int))); - connect(m_winModule, TQT_SIGNAL(windowChanged(WId,unsigned int)), - this, TQT_SLOT(windowChanged(WId,unsigned int))); + connect(m_winModule, TQ_SIGNAL(windowAdded(WId)), + this, TQ_SLOT(windowAdded(WId))); + connect(m_winModule, TQ_SIGNAL(windowRemoved(WId)), + this, TQ_SLOT(windowRemoved(WId))); + connect(m_winModule, TQ_SIGNAL(activeWindowChanged(WId)), + this, TQ_SLOT(activeWindowChanged(WId))); + connect(m_winModule, TQ_SIGNAL(currentDesktopChanged(int)), + this, TQ_SLOT(currentDesktopChanged(int))); + connect(m_winModule, TQ_SIGNAL(windowChanged(WId,unsigned int)), + this, TQ_SLOT(windowChanged(WId,unsigned int))); // register existing windows const TQValueList<WId> windows = m_winModule->windows(); @@ -99,14 +99,14 @@ void TaskManager::configure_startup() return; _startup_info = new TDEStartupInfo( TDEStartupInfo::CleanOnCantDetect, this ); connect( _startup_info, - TQT_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )), - TQT_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& ))); + TQ_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )), + TQ_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& ))); connect( _startup_info, - TQT_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )), - TQT_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& ))); + TQ_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )), + TQ_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& ))); connect( _startup_info, - TQT_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )), - TQT_SLOT( killStartup( const TDEStartupInfoId& ))); + TQ_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )), + TQ_SLOT( killStartup( const TDEStartupInfoId& ))); c.setGroup( "TaskbarButtonSettings" ); _startup_info->setTimeout( c.readUnsignedNumEntry( "Timeout", 30 )); } @@ -1305,7 +1305,7 @@ void Task::updateThumbnail() // by the thumbnail generation. This makes things much smoother // on slower machines. // - TQWidget *rootWin = TQT_TQWIDGET(tqApp->desktop()); + TQWidget *rootWin = tqApp->desktop(); TQRect geom = _info.geometry(); _grab = TQPixmap::grabWindow(rootWin->winId(), geom.x(), geom.y(), @@ -1313,7 +1313,7 @@ void Task::updateThumbnail() if (!_grab.isNull()) { - TQTimer::singleShot(200, this, TQT_SLOT(generateThumbnail())); + TQTimer::singleShot(200, this, TQ_SLOT(generateThumbnail())); } } diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h index 2753218c8..3771d29a6 100644 --- a/kicker/taskmanager/taskmanager.h +++ b/kicker/taskmanager/taskmanager.h @@ -70,7 +70,7 @@ typedef TQValueList<WId> WindowList; */ class KDE_EXPORT Task: public TQObject, public TDEShared { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString visibleIconicName READ visibleIconicName ) TQ_PROPERTY( TQString iconicName READ iconicName ) TQ_PROPERTY( TQString visibleIconicNameWithState READ visibleIconicNameWithState ) @@ -513,7 +513,7 @@ public: */ class KDE_EXPORT Startup: public TQObject, public TDEShared { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString text READ text ) TQ_PROPERTY( TQString bin READ bin ) TQ_PROPERTY( TQString icon READ icon ) @@ -567,7 +567,7 @@ private: */ class KDE_EXPORT TaskManager : public TQObject { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int currentDesktop READ currentDesktop ) TQ_PROPERTY( int numberOfDesktops READ numberOfDesktops ) diff --git a/kicker/taskmanager/taskrmbmenu.cpp b/kicker/taskmanager/taskrmbmenu.cpp index 58682196b..943160d26 100644 --- a/kicker/taskmanager/taskrmbmenu.cpp +++ b/kicker/taskmanager/taskrmbmenu.cpp @@ -78,7 +78,7 @@ void TaskRMBMenu::fillMenu(Task::Ptr t) if (showAll) { id = insertItem(i18n("&To Current Desktop"), - t, TQT_SLOT(toCurrentDesktop())); + t, TQ_SLOT(toCurrentDesktop())); setItemEnabled( id, !t->isOnCurrentDesktop() ); } @@ -88,21 +88,21 @@ void TaskRMBMenu::fillMenu(Task::Ptr t) } } - id = insertItem(SmallIconSet("move"), i18n("&Move"), t, TQT_SLOT(move())); + id = insertItem(SmallIconSet("move"), i18n("&Move"), t, TQ_SLOT(move())); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMove)); - id = insertItem(i18n("Re&size"), t, TQT_SLOT(resize())); + id = insertItem(i18n("Re&size"), t, TQ_SLOT(resize())); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionResize)); - id = insertItem(i18n("Mi&nimize"), t, TQT_SLOT(toggleIconified())); + id = insertItem(i18n("Mi&nimize"), t, TQ_SLOT(toggleIconified())); setItemChecked(id, t->isIconified()); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMinimize)); - id = insertItem(i18n("Ma&ximize"), t, TQT_SLOT(toggleMaximized())); + id = insertItem(i18n("Ma&ximize"), t, TQ_SLOT(toggleMaximized())); setItemChecked(id, t->isMaximized()); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMax)); - id = insertItem(i18n("&Shade"), t, TQT_SLOT(toggleShaded())); + id = insertItem(i18n("&Shade"), t, TQ_SLOT(toggleShaded())); setItemChecked(id, t->isShaded()); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionShade)); @@ -115,28 +115,28 @@ void TaskRMBMenu::fillMenu(Task::Ptr t) insertSeparator(); } - id = insertItem(SmallIcon("window-close"), i18n("&Close"), t, TQT_SLOT(close())); + id = insertItem(SmallIcon("window-close"), i18n("&Close"), t, TQ_SLOT(close())); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionClose)); } void TaskRMBMenu::fillMenu() { - int id; - setCheckable( true ); + int id; + setCheckable( true ); Task::List::iterator itEnd = tasks.end(); for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it) { - Task::Ptr t = (*it); + Task::Ptr t = (*it); - id = insertItem( TQIconSet( t->pixmap() ), - t->visibleNameWithState(), - new TaskRMBMenu(t, this) ); - setItemChecked( id, t->isActive() ); - connectItem( id, t, TQT_SLOT( activateRaiseOrIconify() ) ); - } + id = insertItem( TQIconSet( t->pixmap() ), + t->visibleNameWithState(), + new TaskRMBMenu(t, this) ); + setItemChecked( id, t->isActive() ); + connectItem( id, t, TQ_SLOT( activateRaiseOrIconify() ) ); + } - insertSeparator(); + insertSeparator(); bool enable = false; @@ -144,7 +144,7 @@ void TaskRMBMenu::fillMenu() { id = insertItem(i18n("All to &Desktop"), makeDesktopsMenu()); - id = insertItem(i18n("All &to Current Desktop"), this, TQT_SLOT(slotAllToCurrentDesktop())); + id = insertItem(i18n("All &to Current Desktop"), this, TQ_SLOT(slotAllToCurrentDesktop())); Task::List::iterator itEnd = tasks.end(); for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it) { @@ -159,48 +159,55 @@ void TaskRMBMenu::fillMenu() enable = false; - id = insertItem( i18n( "Mi&nimize All" ), this, TQT_SLOT( slotMinimizeAll() ) ); + id = insertItem( i18n( "Mi&nimize All" ), this, TQ_SLOT( slotMinimizeAll() ) ); itEnd = tasks.end(); for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it) { - if( !(*it)->isIconified() ) { - enable = true; - break; - } - } - setItemEnabled( id, enable ); + if( !(*it)->isIconified() ) { + enable = true; + break; + } + } + setItemEnabled( id, enable ); - enable = false; + enable = false; - id = insertItem( i18n( "Ma&ximize All" ), this, TQT_SLOT( slotMaximizeAll() ) ); + id = insertItem( i18n( "Ma&ximize All" ), this, TQ_SLOT( slotMaximizeAll() ) ); itEnd = tasks.end(); for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it) { if( !(*it)->isMaximized() ) { - enable = true; - break; - } - } - setItemEnabled( id, enable ); + enable = true; + break; + } + } + setItemEnabled( id, enable ); - enable = false; + enable = false; - id = insertItem( i18n( "&Restore All" ), this, TQT_SLOT( slotRestoreAll() ) ); + id = insertItem( i18n( "&Restore All" ), this, TQ_SLOT( slotRestoreAll() ) ); itEnd = tasks.end(); for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it) { - if( (*it)->isIconified() || (*it)->isMaximized() ) { - enable = true; - break; - } - } - setItemEnabled( id, enable ); + if( (*it)->isIconified() || (*it)->isMaximized() ) { + enable = true; + break; + } + } + setItemEnabled( id, enable ); + + insertSeparator(); + + enable = false; - insertSeparator(); + if (taskMoveMenu) { + taskMoveMenu->reparent(this, taskMoveMenu->getWFlags(), taskMoveMenu->geometry().topLeft(), FALSE); + insertItem(i18n("Move Task Button"), taskMoveMenu); - enable = false; + insertSeparator(); + } - insertItem( SmallIcon( "remove" ), i18n( "&Close All" ), this, TQT_SLOT( slotCloseAll() ) ); + insertItem( SmallIcon( "window-close" ), i18n( "&Close All" ), this, TQ_SLOT( slotCloseAll() ) ); } TQPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t) @@ -212,17 +219,17 @@ TQPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t) id = menu->insertItem(SmallIconSet("go-up"), i18n("Keep &Above Others"), - t, TQT_SLOT(toggleAlwaysOnTop())); + t, TQ_SLOT(toggleAlwaysOnTop())); menu->setItemChecked(id, t->isAlwaysOnTop()); id = menu->insertItem(SmallIconSet("go-down"), i18n("Keep &Below Others"), - t, TQT_SLOT(toggleKeptBelowOthers())); + t, TQ_SLOT(toggleKeptBelowOthers())); menu->setItemChecked(id, t->isKeptBelowOthers()); id = menu->insertItem(SmallIconSet("view-fullscreen"), i18n("&Fullscreen"), - t, TQT_SLOT(toggleFullScreen())); + t, TQ_SLOT(toggleFullScreen())); menu->setItemChecked(id, t->isFullScreen()); if (KWin::allowedActionsSupported()) @@ -238,7 +245,7 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t) TQPopupMenu* m = new TQPopupMenu( this ); m->setCheckable( true ); - int id = m->insertItem( i18n("&All Desktops"), t, TQT_SLOT( toDesktop(int) ) ); + int id = m->insertItem( i18n("&All Desktops"), t, TQ_SLOT( toDesktop(int) ) ); m->setItemParameter( id, 0 ); // 0 means all desktops m->setItemChecked( id, t->isOnAllDesktops() ); @@ -246,7 +253,7 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t) for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) { TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&")); - id = m->insertItem( name, t, TQT_SLOT( toDesktop(int) ) ); + id = m->insertItem( name, t, TQ_SLOT( toDesktop(int) ) ); m->setItemParameter( id, i ); m->setItemChecked( id, !t->isOnAllDesktops() && t->desktop() == i ); } @@ -259,14 +266,14 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu() TQPopupMenu* m = new TQPopupMenu( this ); m->setCheckable( true ); - int id = m->insertItem( i18n("&All Desktops"), this, TQT_SLOT( slotAllToDesktop(int) ) ); + int id = m->insertItem( i18n("&All Desktops"), this, TQ_SLOT( slotAllToDesktop(int) ) ); m->setItemParameter( id, 0 ); // 0 means all desktops m->insertSeparator(); for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) { TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&")); - id = m->insertItem( name, this, TQT_SLOT( slotAllToDesktop(int) ) ); + id = m->insertItem( name, this, TQ_SLOT( slotAllToDesktop(int) ) ); m->setItemParameter( id, i ); } diff --git a/kicker/taskmanager/taskrmbmenu.h b/kicker/taskmanager/taskrmbmenu.h index 76b209ca7..a73d83d3a 100644 --- a/kicker/taskmanager/taskrmbmenu.h +++ b/kicker/taskmanager/taskrmbmenu.h @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class KDE_EXPORT TaskRMBMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: TaskRMBMenu(const Task::List&, bool showAll = true, TQPopupMenu* moveMenu = NULL, TQWidget *parent = 0, const char *name = 0); |
