diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-11-13 21:03:36 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-11-13 21:03:36 +0900 |
commit | b965cbac5b21345e9dfc768a7e4f660ffa4aa72f (patch) | |
tree | 7fcff5d301752cbdcdfff64d8791aff1369b803f /kicker/applets | |
parent | 7d6d35b42e00d6b6658951871b29489bdec80714 (diff) | |
download | tdebase-b965cbac5b21345e9dfc768a7e4f660ffa4aa72f.tar.gz tdebase-b965cbac5b21345e9dfc768a7e4f660ffa4aa72f.zip |
Replace Qt with TQt
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'kicker/applets')
-rw-r--r-- | kicker/applets/clock/clock.cpp | 20 | ||||
-rw-r--r-- | kicker/applets/clock/datepicker.cpp | 2 | ||||
-rw-r--r-- | kicker/applets/clock/zone.cpp | 2 | ||||
-rw-r--r-- | kicker/applets/launcher/flowgridmanager.cpp | 16 | ||||
-rw-r--r-- | kicker/applets/launcher/flowgridmanager.h | 8 | ||||
-rw-r--r-- | kicker/applets/launcher/quickbutton.cpp | 8 | ||||
-rw-r--r-- | kicker/applets/launcher/quicklauncher.cpp | 8 | ||||
-rw-r--r-- | kicker/applets/lockout/lockout.cpp | 12 | ||||
-rw-r--r-- | kicker/applets/media/mediaapplet.cpp | 8 | ||||
-rw-r--r-- | kicker/applets/minipager/pagerapplet.cpp | 16 | ||||
-rw-r--r-- | kicker/applets/minipager/pagerbutton.cpp | 4 | ||||
-rw-r--r-- | kicker/applets/run/runapplet.cpp | 4 | ||||
-rw-r--r-- | kicker/applets/systemtray/systemtrayapplet.cpp | 50 | ||||
-rw-r--r-- | kicker/applets/taskbar/taskbarapplet.cpp | 8 | ||||
-rw-r--r-- | kicker/applets/trash/trashapplet.cpp | 4 |
15 files changed, 85 insertions, 85 deletions
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index 536d62065..c4fd6476a 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -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() ); @@ -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); @@ -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(); } @@ -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; @@ -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); 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/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/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/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp index e85732431..741eee46d 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/kicker/applets/launcher/quickbutton.cpp @@ -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); } } diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp index 82a0a35a8..ebdc9346d 100644 --- a/kicker/applets/launcher/quicklauncher.cpp +++ b/kicker/applets/launcher/quicklauncher.cpp @@ -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(); } @@ -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()); } diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp index 75533202c..abe34c978 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 ); @@ -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 ); } } @@ -194,7 +194,7 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e ) conf->setGroup("lockout"); TQMouseEvent *me = TQT_TQMOUSEEVENT( e ); - if( me->button() == Qt::RightButton ) + if( me->button() == TQt::RightButton ) { if( o == lockButton ) { diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp index c3b964ce1..b50aea3d8 100644 --- a/kicker/applets/media/mediaapplet.cpp +++ b/kicker/applets/media/mediaapplet.cpp @@ -154,7 +154,7 @@ void MediaApplet::arrangeButtons() MediumButton *button = *it; button_size = std::max(button_size, - orientation() == 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/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp index ac0fa1340..7685f04d7 100644 --- a/kicker/applets/minipager/pagerapplet.cpp +++ b/kicker/applets/minipager/pagerapplet.cpp @@ -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; @@ -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(); } @@ -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. @@ -728,7 +728,7 @@ void KMiniPager::aboutToShowContextMenu() rowMenu->insertItem(i18n("two rows or columns", "&2"), 2 + rowOffset); rowMenu->insertItem( i18n("three rows or columns", "&3"), 3 + rowOffset); connect(rowMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); - showMenu->insertItem((orientation()==Qt::Horizontal) ? i18n("&Rows"): + showMenu->insertItem((orientation()==TQt::Horizontal) ? i18n("&Rows"): i18n("&Columns"), rowMenu); diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp index 6d3355769..71e3f465b 100644 --- a/kicker/applets/minipager/pagerbutton.cpp +++ b/kicker/applets/minipager/pagerbutton.cpp @@ -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; diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp index aaadfc33d..1121cf45b 100644 --- a/kicker/applets/run/runapplet.cpp +++ b/kicker/applets/run/runapplet.cpp @@ -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/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 2fa4910cf..25a6de7de 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -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()); } @@ -253,7 +253,7 @@ void SystemTrayApplet::preferences() connect(m_settingsDialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(applySettings())); connect(m_settingsDialog, TQT_SIGNAL(finished()), this, TQT_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() @@ -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); } @@ -843,7 +843,7 @@ bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e) else if (e->type() == TQEvent::MouseButtonPress) { TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if (me->button() == Qt::RightButton) + if (me->button() == TQt::RightButton) { p = me->globalPos(); } @@ -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(); } @@ -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/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp index 5673cb563..3e76d6a8d 100644 --- a/kicker/applets/taskbar/taskbarapplet.cpp +++ b/kicker/applets/taskbar/taskbarapplet.cpp @@ -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/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp index f431b8aed..9665d21b9 100644 --- a/kicker/applets/trash/trashapplet.cpp +++ b/kicker/applets/trash/trashapplet.cpp @@ -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 ); } |