From c663b6440964f6ac48027143ac9e63298991f9d0 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:33:34 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kicker/taskbar/taskbar.cpp | 150 +++++++++--------- kicker/taskbar/taskbar.h | 30 ++-- kicker/taskbar/taskbarbindings.cpp | 4 +- kicker/taskbar/taskbarcontainer.cpp | 52 +++---- kicker/taskbar/taskbarcontainer.h | 10 +- kicker/taskbar/taskcontainer.cpp | 302 ++++++++++++++++++------------------ kicker/taskbar/taskcontainer.h | 68 ++++---- 7 files changed, 308 insertions(+), 308 deletions(-) (limited to 'kicker/taskbar') diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp index c2580f5f1..88768e811 100644 --- a/kicker/taskbar/taskbar.cpp +++ b/kicker/taskbar/taskbar.cpp @@ -25,12 +25,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -50,7 +50,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "taskbar.moc" -TaskBar::TaskBar( QWidget *parent, const char *name ) +TaskBar::TaskBar( TQWidget *parent, const char *name ) : Panner( parent, name ), m_showAllWindows(false), m_currentScreen(-1), @@ -65,35 +65,35 @@ TaskBar::TaskBar( QWidget *parent, const char *name ) blocklayout = true; // init - setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); // setup animation frames for (int i = 1; i < 11; i++) { - frames.append(new QPixmap(locate("data", "kicker/pics/disk" + QString::number(i) + ".png"))); + frames.append(new TQPixmap(locate("data", "kicker/pics/disk" + TQString::number(i) + ".png"))); } // configure configure(); - connect(&m_relayoutTimer, SIGNAL(timeout()), - this, SLOT(reLayout())); + connect(&m_relayoutTimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(reLayout())); - connect(this, SIGNAL(contentsMoving(int, int)), SLOT(setBackground())); + connect(this, TQT_SIGNAL(contentsMoving(int, int)), TQT_SLOT(setBackground())); // connect manager - connect(TaskManager::the(), SIGNAL(taskAdded(Task::Ptr)), - this, SLOT(add(Task::Ptr))); - connect(TaskManager::the(), SIGNAL(taskRemoved(Task::Ptr)), - this, SLOT(remove(Task::Ptr))); - connect(TaskManager::the(), SIGNAL(startupAdded(Startup::Ptr)), - this, SLOT(add(Startup::Ptr))); - connect(TaskManager::the(), SIGNAL(startupRemoved(Startup::Ptr)), - this, SLOT(remove(Startup::Ptr))); - connect(TaskManager::the(), SIGNAL(desktopChanged(int)), - this, SLOT(desktopChanged(int))); - connect(TaskManager::the(), SIGNAL(windowChanged(Task::Ptr)), - this, SLOT(windowChanged(Task::Ptr))); + 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))); isGrouping = shouldGroup(); @@ -115,7 +115,7 @@ TaskBar::TaskBar( QWidget *parent, const char *name ) blocklayout = false; - connect(kapp, SIGNAL(settingsChanged(int)), SLOT(slotSettingsChanged(int))); + connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); keys = new KGlobalAccel( this ); #include "taskbarbindings.cpp" keys->readSettings(); @@ -159,22 +159,22 @@ KTextShadowEngine *TaskBar::textShadowEngine() } -QSize TaskBar::sizeHint() const +TQSize TaskBar::sizeHint() const { // get our minimum height based on the minimum button height or the // height of the font in use, which is largest - QFontMetrics fm(KGlobalSettings::taskbarFont()); + TQFontMetrics fm(KGlobalSettings::taskbarFont()); int minButtonHeight = fm.height() > TaskBarSettings::minimumButtonHeight() ? fm.height() : TaskBarSettings::minimumButtonHeight(); - return QSize(BUTTON_MIN_WIDTH, minButtonHeight); + return TQSize(BUTTON_MIN_WIDTH, minButtonHeight); } -QSize TaskBar::sizeHint( KPanelExtension::Position p, QSize maxSize) const +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 - QFontMetrics fm(KGlobalSettings::taskbarFont()); + TQFontMetrics fm(KGlobalSettings::taskbarFont()); int minButtonHeight = fm.height() > TaskBarSettings::minimumButtonHeight() ? fm.height() : TaskBarSettings::minimumButtonHeight(); @@ -191,7 +191,7 @@ QSize TaskBar::sizeHint( KPanelExtension::Position p, QSize maxSize) const { return maxSize; } - return QSize( maxSize.width(), actualMax ); + return TQSize( maxSize.width(), actualMax ); } else { @@ -224,7 +224,7 @@ QSize TaskBar::sizeHint( KPanelExtension::Position p, QSize maxSize) const { return maxSize; } - return QSize( actualMax, maxSize.height() ); + return TQSize( actualMax, maxSize.height() ); } } @@ -242,8 +242,8 @@ void TaskBar::configure() m_currentScreen = -1; // Show all screens or re-get our screen m_showOnlyCurrentScreen = (TaskBarSettings::showCurrentScreenOnly() && - QApplication::desktop()->isVirtualDesktop() && - QApplication::desktop()->numScreens() > 1) || (QApplication::desktop()->numScreens() < 2); + TQApplication::desktop()->isVirtualDesktop() && + TQApplication::desktop()->numScreens() > 1) || (TQApplication::desktop()->numScreens() < 2); // we need to watch geometry issues if we aren't showing windows when we // are paying attention to the current Xinerama screen @@ -251,10 +251,10 @@ void TaskBar::configure() { // disconnect first in case we've been here before // to avoid multiple connections - disconnect(TaskManager::the(), SIGNAL(windowChangedGeometry(Task::Ptr)), - this, SLOT(windowChangedGeometry(Task::Ptr))); - connect(TaskManager::the(), SIGNAL(windowChangedGeometry(Task::Ptr)), - this, SLOT(windowChangedGeometry(Task::Ptr))); + disconnect(TaskManager::the(), TQT_SIGNAL(windowChangedGeometry(Task::Ptr)), + this, TQT_SLOT(windowChangedGeometry(Task::Ptr))); + connect(TaskManager::the(), TQT_SIGNAL(windowChangedGeometry(Task::Ptr)), + this, TQT_SLOT(windowChangedGeometry(Task::Ptr))); } TaskManager::the()->trackGeometry(m_showOnlyCurrentScreen); @@ -283,18 +283,18 @@ void TaskBar::setOrientation( Orientation o ) reLayoutEventually(); } -void TaskBar::moveEvent( QMoveEvent* e ) +void TaskBar::moveEvent( TQMoveEvent* e ) { Panner::moveEvent(e); setViewportBackground(); } -void TaskBar::resizeEvent( QResizeEvent* e ) +void TaskBar::resizeEvent( TQResizeEvent* e ) { if (m_showOnlyCurrentScreen) { - QPoint topLeft = mapToGlobal(this->geometry().topLeft()); - if (m_currentScreen != QApplication::desktop()->screenNumber(topLeft)) + TQPoint topLeft = mapToGlobal(this->geometry().topLeft()); + if (m_currentScreen != TQApplication::desktop()->screenNumber(topLeft)) { // we have been moved to another screen! m_currentScreen = -1; @@ -366,7 +366,7 @@ void TaskBar::add(Startup::Ptr startup) // create new container TaskContainer *container = new TaskContainer(startup, frames, this, viewport()); m_hiddenContainers.append(container); - connect(container, SIGNAL(showMe(TaskContainer*)), this, SLOT(showTaskContainer(TaskContainer*))); + connect(container, TQT_SIGNAL(showMe(TaskContainer*)), this, TQT_SLOT(showTaskContainer(TaskContainer*))); } void TaskBar::showTaskContainer(TaskContainer* container) @@ -654,8 +654,8 @@ void TaskBar::reLayoutEventually() void TaskBar::reLayout() { - // Because QPopupMenu::exec() creates its own event loop, deferred deletes - // via QObject::deleteLater() may be prematurely executed when a container's + // Because TQPopupMenu::exec() creates its own event loop, deferred deletes + // via TQObject::deleteLater() may be prematurely executed when a container's // popup menu is visible. // // To get around this, we collect the containers and delete them manually @@ -695,7 +695,7 @@ 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 - QFontMetrics fm(KGlobalSettings::taskbarFont()); + TQFontMetrics fm(KGlobalSettings::taskbarFont()); int minButtonHeight = fm.height() > TaskBarSettings::minimumButtonHeight() ? fm.height() : TaskBarSettings::minimumButtonHeight(); @@ -756,7 +756,7 @@ void TaskBar::reLayout() } int i = 0; - bool reverseLayout = QApplication::reverseLayout(); + bool reverseLayout = TQApplication::reverseLayout(); for (TaskContainer::Iterator it = list.begin(); it != list.end(); ++it, i++) @@ -812,16 +812,16 @@ void TaskBar::reLayout() } } - QTimer::singleShot(100, this, SLOT(publishIconGeometry())); + TQTimer::singleShot(100, this, TQT_SLOT(publishIconGeometry())); } void TaskBar::setViewportBackground() { - const QPixmap *bg = parentWidget()->backgroundPixmap(); + const TQPixmap *bg = parentWidget()->backgroundPixmap(); if (bg) { - QPixmap pm(parentWidget()->size()); + TQPixmap pm(parentWidget()->size()); pm.fill(parentWidget(), pos() + viewport()->pos()); viewport()->setPaletteBackgroundPixmap(pm); viewport()->setBackgroundOrigin(WidgetOrigin); @@ -863,7 +863,7 @@ void TaskBar::setArrowType(Qt::ArrowType at) void TaskBar::publishIconGeometry() { - QPoint p = mapToGlobal(QPoint(0,0)); // roundtrip, don't do that too often + TQPoint p = mapToGlobal(TQPoint(0,0)); // roundtrip, don't do that too often for (TaskContainer::Iterator it = containers.begin(); it != containers.end(); @@ -873,37 +873,37 @@ void TaskBar::publishIconGeometry() } } -void TaskBar::viewportMousePressEvent( QMouseEvent* e ) +void TaskBar::viewportMousePressEvent( TQMouseEvent* e ) { propagateMouseEvent( e ); } -void TaskBar::viewportMouseReleaseEvent( QMouseEvent* e ) +void TaskBar::viewportMouseReleaseEvent( TQMouseEvent* e ) { propagateMouseEvent( e ); } -void TaskBar::viewportMouseDoubleClickEvent( QMouseEvent* e ) +void TaskBar::viewportMouseDoubleClickEvent( TQMouseEvent* e ) { propagateMouseEvent( e ); } -void TaskBar::viewportMouseMoveEvent( QMouseEvent* e ) +void TaskBar::viewportMouseMoveEvent( TQMouseEvent* e ) { propagateMouseEvent( e ); } -void TaskBar::propagateMouseEvent( QMouseEvent* e ) +void TaskBar::propagateMouseEvent( TQMouseEvent* e ) { if ( !isTopLevel() ) { - QMouseEvent me( e->type(), mapTo( topLevelWidget(), e->pos() ), + TQMouseEvent me( e->type(), mapTo( topLevelWidget(), e->pos() ), e->globalPos(), e->button(), e->state() ); - QApplication::sendEvent( topLevelWidget(), &me ); + TQApplication::sendEvent( topLevelWidget(), &me ); } } -bool TaskBar::idMatch( const QString& id1, const QString& id2 ) +bool TaskBar::idMatch( const TQString& id1, const TQString& id2 ) { if ( id1.isEmpty() || id2.isEmpty() ) return false; @@ -949,7 +949,7 @@ int TaskBar::taskCount() const int TaskBar::maximumButtonsWithoutShrinking() const { - QFontMetrics fm(KGlobalSettings::taskbarFont()); + TQFontMetrics fm(KGlobalSettings::taskbarFont()); int minButtonHeight = fm.height() > TaskBarSettings::minimumButtonHeight() ? fm.height() : TaskBarSettings::minimumButtonHeight(); int rows = contentsRect().height() / minButtonHeight; @@ -1124,7 +1124,7 @@ void TaskBar::activateNextTask(bool forward) } } -void TaskBar::wheelEvent(QWheelEvent* e) +void TaskBar::wheelEvent(TQWheelEvent* e) { if (e->delta() > 0) { @@ -1162,35 +1162,35 @@ int TaskBar::showScreen() const if (m_showOnlyCurrentScreen && m_currentScreen == -1) { const_cast(this)->m_currentScreen = - QApplication::desktop()->screenNumber(mapToGlobal(this->geometry().topLeft())); + TQApplication::desktop()->screenNumber(mapToGlobal(this->geometry().topLeft())); } return m_currentScreen; } -QImage* TaskBar::blendGradient(const QSize& size) +TQImage* TaskBar::blendGradient(const TQSize& size) { if (m_blendGradient.isNull() || m_blendGradient.size() != size) { - QPixmap bgpm(size); - QPainter bgp(&bgpm); + TQPixmap bgpm(size); + TQPainter bgp(&bgpm); bgpm.fill(black); - if (QApplication::reverseLayout()) + if (TQApplication::reverseLayout()) { - QImage gradient = KImageEffect::gradient( - QSize(30, size.height()), - QColor(255,255,255), - QColor(0,0,0), + TQImage gradient = KImageEffect::gradient( + TQSize(30, size.height()), + TQColor(255,255,255), + TQColor(0,0,0), KImageEffect::HorizontalGradient); bgp.drawImage(0, 0, gradient); } else { - QImage gradient = KImageEffect::gradient( - QSize(30, size.height()), - QColor(0,0,0), - QColor(255,255,255), + TQImage gradient = KImageEffect::gradient( + TQSize(30, size.height()), + TQColor(0,0,0), + TQColor(255,255,255), KImageEffect::HorizontalGradient); bgp.drawImage(size.width() - 30, 0, gradient); } @@ -1203,7 +1203,7 @@ QImage* TaskBar::blendGradient(const QSize& size) void TaskBar::sortContainersByDesktop(TaskContainer::List& list) { - typedef QValueVector > > SortVector; + typedef TQValueVector > > SortVector; SortVector sorted; sorted.resize(list.count()); int i = 0; diff --git a/kicker/taskbar/taskbar.h b/kicker/taskbar/taskbar.h index 73c397670..ff160bc92 100644 --- a/kicker/taskbar/taskbar.h +++ b/kicker/taskbar/taskbar.h @@ -44,11 +44,11 @@ class TaskBar : public Panner Q_OBJECT public: - TaskBar( QWidget *parent = 0, const char *name = 0 ); + TaskBar( TQWidget *parent = 0, const char *name = 0 ); ~TaskBar(); - QSize sizeHint() const; - QSize sizeHint( KPanelExtension::Position, QSize maxSize ) const; + TQSize sizeHint() const; + TQSize sizeHint( KPanelExtension::Position, TQSize maxSize ) const; void setOrientation( Orientation ); void setArrowType( Qt::ArrowType at ); @@ -61,7 +61,7 @@ public: bool sortByDesktop() const { return m_sortByDesktop; } bool showAllWindows() const { return m_showAllWindows; } - QImage* blendGradient(const QSize& size); + TQImage* blendGradient(const TQSize& size); KTextShadowEngine *textShadowEngine(); @@ -93,15 +93,15 @@ protected slots: protected: void reLayoutEventually(); - void viewportMousePressEvent( QMouseEvent* ); - void viewportMouseReleaseEvent( QMouseEvent* ); - void viewportMouseDoubleClickEvent( QMouseEvent* ); - void viewportMouseMoveEvent( QMouseEvent* ); - void wheelEvent(QWheelEvent*); - void propagateMouseEvent( QMouseEvent* ); - void resizeEvent( QResizeEvent* ); - void moveEvent( QMoveEvent* ); - bool idMatch( const QString& id1, const QString& id2 ); + void viewportMousePressEvent( TQMouseEvent* ); + void viewportMouseReleaseEvent( TQMouseEvent* ); + void viewportMouseDoubleClickEvent( TQMouseEvent* ); + void viewportMouseMoveEvent( TQMouseEvent* ); + void wheelEvent(TQWheelEvent*); + void propagateMouseEvent( TQMouseEvent* ); + void resizeEvent( TQResizeEvent* ); + void moveEvent( TQMoveEvent* ); + bool idMatch( const TQString& id1, const TQString& id2 ); TaskContainer::List filteredContainers(); private: @@ -127,9 +127,9 @@ private: void reGroup(); KGlobalAccel* keys; KTextShadowEngine* m_textShadowEngine; - QTimer m_relayoutTimer; + TQTimer m_relayoutTimer; bool m_ignoreUpdates; - QImage m_blendGradient; + TQImage m_blendGradient; }; #endif diff --git a/kicker/taskbar/taskbarbindings.cpp b/kicker/taskbar/taskbarbindings.cpp index 63accd854..c457d3623 100644 --- a/kicker/taskbar/taskbarbindings.cpp +++ b/kicker/taskbar/taskbarbindings.cpp @@ -23,10 +23,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef NOSLOTS # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), QString::null, key3, key4, this, SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), QString::null, key3, key4 ) + keys->insert( name, i18n(name), TQString::null, key3, key4 ) #endif #define WIN KKey::QtWIN diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp index a548b7837..661706bdb 100644 --- a/kicker/taskbar/taskbarcontainer.cpp +++ b/kicker/taskbar/taskbarcontainer.cpp @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include -#include +#include +#include #include #include @@ -42,8 +42,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "taskbarcontainer.h" #include "taskbarcontainer.moc" -TaskBarContainer::TaskBarContainer( bool enableFrame, QWidget *parent, const char *name ) - : QFrame(parent, name), +TaskBarContainer::TaskBarContainer( bool enableFrame, TQWidget *parent, const char *name ) + : TQFrame(parent, name), direction( KPanelApplet::Up ), showWindowListButton( true ), windowListButton(0), @@ -63,16 +63,16 @@ TaskBarContainer::TaskBarContainer( bool enableFrame, QWidget *parent, const cha margin = 0; } - layout = new QBoxLayout( this, QApplication::reverseLayout() ? - QBoxLayout::RightToLeft : - QBoxLayout::LeftToRight ); + layout = new TQBoxLayout( this, TQApplication::reverseLayout() ? + TQBoxLayout::RightToLeft : + TQBoxLayout::LeftToRight ); layout->setMargin( margin ); // scrollable taskbar taskBar = new TaskBar(this); layout->addWidget( taskBar ); - connect( taskBar, SIGNAL( containerCountChanged() ), SIGNAL( containerCountChanged() ) ); + connect( taskBar, TQT_SIGNAL( containerCountChanged() ), TQT_SIGNAL( containerCountChanged() ) ); setBackground(); @@ -105,13 +105,13 @@ void TaskBarContainer::configure() // window list button windowListButton = new SimpleButton(this); windowListMenu= new KWindowListMenu; - connect(windowListButton, SIGNAL(pressed()), - SLOT(showWindowListMenu())); - connect(windowListMenu, SIGNAL(aboutToHide()), - SLOT(windowListMenuAboutToHide())); + connect(windowListButton, TQT_SIGNAL(pressed()), + TQT_SLOT(showWindowListMenu())); + connect(windowListMenu, TQT_SIGNAL(aboutToHide()), + TQT_SLOT(windowListMenuAboutToHide())); // geometry - QString icon; + TQString icon; switch (direction) { case KPanelApplet::Up: @@ -156,7 +156,7 @@ void TaskBarContainer::configChanged() void TaskBarContainer::preferences() { - QByteArray data; + TQByteArray data; if (!kapp->dcopClient()->isAttached()) { @@ -175,9 +175,9 @@ void TaskBarContainer::orientationChange(Orientation o) windowListButton->setFixedWidth(WINDOWLISTBUTTON_SIZE); windowListButton->setMaximumHeight(BUTTON_MAX_WIDTH); } - layout->setDirection(QApplication::reverseLayout() ? - QBoxLayout::RightToLeft : - QBoxLayout::LeftToRight); + layout->setDirection(TQApplication::reverseLayout() ? + TQBoxLayout::RightToLeft : + TQBoxLayout::LeftToRight); } else { @@ -186,7 +186,7 @@ void TaskBarContainer::orientationChange(Orientation o) windowListButton->setMaximumWidth(BUTTON_MAX_WIDTH); windowListButton->setFixedHeight(WINDOWLISTBUTTON_SIZE); } - layout->setDirection(QBoxLayout::TopToBottom); + layout->setDirection(TQBoxLayout::TopToBottom); } taskBar->setOrientation(o); @@ -202,7 +202,7 @@ void TaskBarContainer::popupDirectionChange(KPanelApplet::Direction d) direction = d; ArrowType at = UpArrow; - QString icon; + TQString icon; switch (d) { case KPanelApplet::Up: @@ -242,7 +242,7 @@ void TaskBarContainer::showWindowListMenu() windowListMenu->init(); // calc popup menu position - QPoint pos( mapToGlobal( QPoint(0,0) ) ); + TQPoint pos( mapToGlobal( TQPoint(0,0) ) ); switch( direction ) { case KPanelApplet::Right: @@ -260,9 +260,9 @@ void TaskBarContainer::showWindowListMenu() break; } - disconnect( windowListButton, SIGNAL( pressed() ), this, SLOT( showWindowListMenu() ) ); + disconnect( windowListButton, TQT_SIGNAL( pressed() ), this, TQT_SLOT( showWindowListMenu() ) ); windowListMenu->exec( pos ); - QTimer::singleShot(100, this, SLOT(reconnectWindowListButton())); + TQTimer::singleShot(100, this, TQT_SLOT(reconnectWindowListButton())); } void TaskBarContainer::windowListMenuAboutToHide() @@ -274,14 +274,14 @@ void TaskBarContainer::windowListMenuAboutToHide() void TaskBarContainer::reconnectWindowListButton() { - connect( windowListButton, SIGNAL( pressed() ), SLOT( showWindowListMenu() ) ); + connect( windowListButton, TQT_SIGNAL( pressed() ), TQT_SLOT( showWindowListMenu() ) ); } -QSize TaskBarContainer::sizeHint( KPanelExtension::Position p, QSize maxSize) const +TQSize TaskBarContainer::sizeHint( KPanelExtension::Position p, TQSize maxSize) const { - QSize size = taskBar->sizeHint( p, maxSize ); + TQSize size = taskBar->sizeHint( p, maxSize ); if ( (p == KPanelExtension::Left || p == KPanelExtension::Right) && showWindowListButton ) { - return QSize( size.width(), size.height() + WINDOWLISTBUTTON_SIZE ); + return TQSize( size.width(), size.height() + WINDOWLISTBUTTON_SIZE ); } return size; } diff --git a/kicker/taskbar/taskbarcontainer.h b/kicker/taskbar/taskbarcontainer.h index c265036b6..6c542ef00 100644 --- a/kicker/taskbar/taskbarcontainer.h +++ b/kicker/taskbar/taskbarcontainer.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __taskbarcontainer_h__ #define __taskbarcontainer_h__ -#include +#include #include #include @@ -35,20 +35,20 @@ class SimpleButton; class KWindowListMenu; class TaskBar; -class KDE_EXPORT TaskBarContainer : public QFrame, public DCOPObject +class KDE_EXPORT TaskBarContainer : public TQFrame, public DCOPObject { Q_OBJECT K_DCOP public: - TaskBarContainer( bool enableFrame, QWidget* parent = 0, const char* name = 0 ); + TaskBarContainer( bool enableFrame, TQWidget* parent = 0, const char* name = 0 ); ~TaskBarContainer(); void orientationChange( Orientation ); void popupDirectionChange( KPanelApplet::Direction ); void preferences(); //FIXME: don't use Position, use Orientation - QSize sizeHint( KPanelExtension::Position, QSize maxSize ) const; + TQSize sizeHint( KPanelExtension::Position, TQSize maxSize ) const; void setBackground(); k_dcop: @@ -66,7 +66,7 @@ protected slots: private: KPanelApplet::Direction direction; bool showWindowListButton; - QBoxLayout * layout; + TQBoxLayout * layout; TaskBar * taskBar; SimpleButton * windowListButton; KWindowListMenu * windowListMenu; diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index 7025d643a..6bc74044e 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/kicker/taskbar/taskcontainer.cpp @@ -25,15 +25,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -55,8 +55,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "taskcontainer.moc" TaskContainer::TaskContainer(Task::Ptr task, TaskBar* bar, - QWidget *parent, const char *name) - : QToolButton(parent, name), + TQWidget *parent, const char *name) + : TQToolButton(parent, name), currentFrame(0), attentionState(-1), lastActivated(0), @@ -82,8 +82,8 @@ TaskContainer::TaskContainer(Task::Ptr task, TaskBar* bar, } TaskContainer::TaskContainer(Startup::Ptr startup, PixmapList& startupFrames, - TaskBar* bar, QWidget *parent, const char *name) - : QToolButton(parent, name), + TaskBar* bar, TQWidget *parent, const char *name) + : TQToolButton(parent, name), currentFrame(0), frames(startupFrames), attentionState(-1), @@ -102,7 +102,7 @@ TaskContainer::TaskContainer(Startup::Ptr startup, PixmapList& startupFrames, sid = m_startup->bin(); - connect(m_startup, SIGNAL(changed()), SLOT(update())); + connect(m_startup, TQT_SIGNAL(changed()), TQT_SLOT(update())); dragSwitchTimer.start(333, true); } @@ -111,14 +111,14 @@ void TaskContainer::init() { setWFlags(WNoAutoErase); setBackgroundMode(NoBackground); - animBg = QPixmap(16, 16); + animBg = TQPixmap(16, 16); installEventFilter(KickerTip::the()); - connect(&animationTimer, SIGNAL(timeout()), SLOT(animationTimerFired())); - connect(&dragSwitchTimer, SIGNAL(timeout()), SLOT(showMe())); - connect(&attentionTimer, SIGNAL(timeout()), SLOT(attentionTimerFired())); - connect(&m_paintEventCompressionTimer, SIGNAL(timeout()), SLOT(updateNow())); + 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())); } TaskContainer::~TaskContainer() @@ -138,8 +138,8 @@ void TaskContainer::showMe() animationTimer.start(100); emit showMe(this); - disconnect(&dragSwitchTimer, SIGNAL(timeout()), this, SLOT(showMe())); - connect(&dragSwitchTimer, SIGNAL(timeout()), SLOT(dragSwitch())); + disconnect(&dragSwitchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(showMe())); + connect(&dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(dragSwitch())); } void TaskContainer::stopTimers() @@ -159,7 +159,7 @@ void TaskContainer::taskChanged(bool geometryOnlyChange) return; } - const QObject* source = 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) @@ -182,7 +182,7 @@ void TaskContainer::taskChanged(bool geometryOnlyChange) void TaskContainer::iconChanged() { - const QObject* source = 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) @@ -204,7 +204,7 @@ void TaskContainer::iconChanged() } KickerTip::Client::updateKickerTip(); - QToolButton::update(); + TQToolButton::update(); } void TaskContainer::setLastActivated() @@ -227,14 +227,14 @@ void TaskContainer::animationTimerFired() { if (!frames.isEmpty() && taskBar->showIcon() && frames.at(currentFrame) != frames.end()) { - QPixmap *pm = *frames.at(currentFrame); + TQPixmap *pm = *frames.at(currentFrame); // draw pixmap if ( pm && !pm->isNull() ) { // we only have to redraw the background for frames 0, 8 and 9 if ( currentFrame == 0 || currentFrame > 7 ) { // double buffered painting - QPixmap composite( animBg ); + TQPixmap composite( animBg ); bitBlt( &composite, 0, 0, pm ); bitBlt( this, iconRect.x(), iconRect.y(), &composite ); } @@ -298,16 +298,16 @@ void TaskContainer::attentionTimerFired() update(); } -QSizePolicy TaskContainer::sizePolicy() const +TQSizePolicy TaskContainer::sizePolicy() const { - return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); + return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); } -void TaskContainer::resizeEvent( QResizeEvent * ) +void TaskContainer::resizeEvent( TQResizeEvent * ) { // calculate the icon rect - QRect br( style().subRect( QStyle::SR_PushButtonContents, this ) ); - iconRect = QStyle::visualRect( QRect(br.x() + 2, (height() - 16) / 2, 16, 16), this ); + TQRect br( style().subRect( TQStyle::SR_PushButtonContents, this ) ); + iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this ); } void TaskContainer::add(Task::Ptr task) @@ -330,9 +330,9 @@ void TaskContainer::add(Task::Ptr task) KickerTip::Client::updateKickerTip(); update(); - connect(task, SIGNAL(changed(bool)), SLOT(taskChanged(bool))); - connect(task, SIGNAL(iconChanged()), SLOT(iconChanged())); - connect(task, SIGNAL(activated()), SLOT(setLastActivated())); + 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())); } void TaskContainer::remove(Task::Ptr task) @@ -342,7 +342,7 @@ void TaskContainer::remove(Task::Ptr task) return; } - task->publishIconGeometry(QRect()); + task->publishIconGeometry(TQRect()); for (Task::List::Iterator it = tasks.begin(); it != tasks.end(); ++it) { if ((*it) == task) @@ -424,7 +424,7 @@ bool TaskContainer::isEmpty() return (tasks.isEmpty() && !m_startup); } -QString TaskContainer::id() +TQString TaskContainer::id() { return sid; } @@ -440,7 +440,7 @@ void TaskContainer::setBackground() updateNow(); } -void TaskContainer::paintEvent( QPaintEvent* ) +void TaskContainer::paintEvent( TQPaintEvent* ) { if (!m_paintEventCompression) { @@ -452,14 +452,14 @@ void TaskContainer::paintEvent( QPaintEvent* ) } m_paintEventCompression = false; - QPixmap* pm = new QPixmap(size()); + TQPixmap* pm = new TQPixmap(size()); - const QPixmap* background = taskBar->backgroundPixmap(); + const TQPixmap* background = taskBar->backgroundPixmap(); if (background) { - QPoint pt = mapTo(taskBar, QPoint(0, 0)) + taskBar->backgroundOffset(); - QPainter p(pm); + TQPoint pt = mapTo(taskBar, TQPoint(0, 0)) + taskBar->backgroundOffset(); + TQPainter p(pm); p.drawTiledPixmap(0, 0, width(), height(), *background, pt.x(), pt.y()); p.end(); } @@ -468,7 +468,7 @@ void TaskContainer::paintEvent( QPaintEvent* ) pm->fill(taskBar->paletteBackgroundColor()); } - QPainter p; + TQPainter p; p.begin(pm ,this); drawButton(&p); p.end(); @@ -477,7 +477,7 @@ void TaskContainer::paintEvent( QPaintEvent* ) delete pm; } -void TaskContainer::drawButton(QPainter *p) +void TaskContainer::drawButton(TQPainter *p) { if (isEmpty()) { @@ -485,8 +485,8 @@ void TaskContainer::drawButton(QPainter *p) } // get a pointer to the pixmap we're drawing on - QPixmap *pm((QPixmap*)p->device()); - QPixmap pixmap; // icon + TQPixmap *pm((TQPixmap*)p->device()); + TQPixmap pixmap; // icon Task::Ptr task = 0; bool iconified = !TaskBarSettings::showOnlyIconified(); bool halo = TaskBarSettings::haloText(); @@ -494,7 +494,7 @@ void TaskContainer::drawButton(QPainter *p) bool drawButton = alwaysDrawButtons || (m_mouseOver && !halo && isEnabled() && TaskBarSettings::showButtonOnHover()); - QFont font(KGlobalSettings::taskbarFont()); + TQFont font(KGlobalSettings::taskbarFont()); // draw sunken if we contain the active task bool active = false; @@ -522,14 +522,14 @@ void TaskContainer::drawButton(QPainter *p) font.setBold(active); - QColorGroup colors = palette().active(); + TQColorGroup colors = palette().active(); if (TaskBarSettings::useCustomColors()) { - colors.setColor( QColorGroup::Button, TaskBarSettings::taskBackgroundColor()); - colors.setColor( QColorGroup::Background, TaskBarSettings::taskBackgroundColor() ); - colors.setColor( QColorGroup::ButtonText, TaskBarSettings::inactiveTaskTextColor() ); - colors.setColor( QColorGroup::Text, TaskBarSettings::inactiveTaskTextColor() ); + colors.setColor( TQColorGroup::Button, TaskBarSettings::taskBackgroundColor()); + colors.setColor( TQColorGroup::Background, TaskBarSettings::taskBackgroundColor() ); + colors.setColor( TQColorGroup::ButtonText, TaskBarSettings::inactiveTaskTextColor() ); + colors.setColor( TQColorGroup::Text, TaskBarSettings::inactiveTaskTextColor() ); } if (demandsAttention) @@ -538,29 +538,29 @@ void TaskContainer::drawButton(QPainter *p) { halo = true; - QRect r = rect(); - QColor line = colors.highlight(); + TQRect r = rect(); + TQColor line = colors.highlight(); r.addCoords(2, 2, -2, -2); p->fillRect(r, line); for (int i = 0; i < 2; ++i) { line = KickerLib::blendColors(line, colors.background()); - p->setPen(QPen(line, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); + p->setPen(TQPen(line, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); r.addCoords(-1, -1, 1, 1); p->drawRect(r); } } // blink until blink timeout, then display differently without blinking - colors.setColor( QColorGroup::Button, colors.highlight() ); - colors.setColor( QColorGroup::Background, colors.highlight() ); - colors.setColor( QColorGroup::ButtonText, colors.highlightedText() ); - colors.setColor( QColorGroup::Text, colors.highlightedText() ); + colors.setColor( TQColorGroup::Button, colors.highlight() ); + colors.setColor( TQColorGroup::Background, colors.highlight() ); + colors.setColor( TQColorGroup::ButtonText, colors.highlightedText() ); + colors.setColor( TQColorGroup::Text, colors.highlightedText() ); } if (active || aboutToActivate) { - colors.setColor(QColorGroup::Button, colors.button().dark(110)); + colors.setColor(TQColorGroup::Button, colors.button().dark(110)); } // get the task icon @@ -570,16 +570,16 @@ void TaskContainer::drawButton(QPainter *p) } bool sunken = isDown() || (alwaysDrawButtons && (active || aboutToActivate)); - bool reverse = QApplication::reverseLayout(); - QRect br(style().subRect(QStyle::SR_PushButtonContents, this)); - QPoint shift = QPoint(style().pixelMetric(QStyle::PM_ButtonShiftHorizontal), - style().pixelMetric(QStyle::PM_ButtonShiftVertical)); + bool reverse = TQApplication::reverseLayout(); + TQRect br(style().subRect(TQStyle::SR_PushButtonContents, this)); + TQPoint shift = TQPoint(style().pixelMetric(TQStyle::PM_ButtonShiftHorizontal), + style().pixelMetric(TQStyle::PM_ButtonShiftVertical)); // draw button background if (drawButton) { - style().drawPrimitive(QStyle::PE_HeaderSection, p, - QRect(0, 0, width(), height()), + style().drawPrimitive(TQStyle::PE_HeaderSection, p, + TQRect(0, 0, width(), height()), colors); } @@ -601,7 +601,7 @@ void TaskContainer::drawButton(QPainter *p) // make sure it is no larger than 16x16 if ( pixmap.width() > 16 || pixmap.height() > 16 ) { - QImage tmp = pixmap.convertToImage(); + TQImage tmp = pixmap.convertToImage(); pixmap.convertFromImage( tmp.smoothScale( 16, 16 ) ); } @@ -612,17 +612,17 @@ void TaskContainer::drawButton(QPainter *p) } // draw icon - QRect pmr(0, 0, pixmap.width(), pixmap.height()); + TQRect pmr(0, 0, pixmap.width(), pixmap.height()); pmr.moveCenter(iconRect.center()); p->drawPixmap(pmr, pixmap); } } // find text - QString text = name(); + TQString text = name(); // modified overlay - static QString modStr = "[" + i18n( "modified" ) + "]"; + static TQString modStr = "[" + i18n( "modified" ) + "]"; int modStrPos = text.find( modStr ); int textPos = ( taskBar->showIcon() && (!pixmap.isNull() || m_startup)) ? 2 + 16 + 2 : 0; @@ -630,12 +630,12 @@ void TaskContainer::drawButton(QPainter *p) { // +1 because we include a space after the closing brace. text.remove(modStrPos, modStr.length() + 1); - QPixmap modPixmap = SmallIcon("modified"); + TQPixmap modPixmap = SmallIcon("modified"); // draw modified overlay if (!modPixmap.isNull()) { - QRect r = QStyle::visualRect(QRect(br.x() + textPos, + TQRect r = TQStyle::visualRect(TQRect(br.x() + textPos, (height() - 16) / 2, 16, 16), this); @@ -652,27 +652,27 @@ void TaskContainer::drawButton(QPainter *p) // draw text if (!text.isEmpty()) { - QRect tr = QStyle::visualRect(QRect(br.x() + textPos + 1, 0, + TQRect tr = TQStyle::visualRect(TQRect(br.x() + textPos + 1, 0, width() - textPos, height()), this); int textFlags = AlignVCenter | SingleLine; textFlags |= reverse ? AlignRight : AlignLeft; - QPen textPen; + TQPen textPen; // get the color for the text label if (iconified) { - textPen = QPen(KickerLib::blendColors(colors.button(), colors.buttonText())); + textPen = TQPen(KickerLib::blendColors(colors.button(), colors.buttonText())); } else if (!active) { - textPen = QPen(colors.buttonText()); + textPen = TQPen(colors.buttonText()); } else // hack for the dotNET style and others { if (TaskBarSettings::useCustomColors()) { - textPen = QPen(TaskBarSettings::activeTaskTextColor()); + textPen = TQPen(TaskBarSettings::activeTaskTextColor()); } else { @@ -686,11 +686,11 @@ void TaskContainer::drawButton(QPainter *p) availableWidth -= 8; } - if (QFontMetrics(font).width(text) > availableWidth) + if (TQFontMetrics(font).width(text) > availableWidth) { // draw text into overlay pixmap - QPixmap tpm(*pm); - QPainter tp(&tpm); + TQPixmap tpm(*pm); + TQPainter tp(&tpm); if (sunken) { @@ -710,8 +710,8 @@ void TaskContainer::drawButton(QPainter *p) } // blend text into background image - QImage img = pm->convertToImage(); - QImage timg = tpm.convertToImage(); + TQImage img = pm->convertToImage(); + TQImage timg = tpm.convertToImage(); KImageEffect::blend(img, timg, *taskBar->blendGradient(size()), KImageEffect::Red); pm->convertFromImage(img); } @@ -733,12 +733,12 @@ void TaskContainer::drawButton(QPainter *p) if (!frames.isEmpty() && m_startup && frames.at(currentFrame) != frames.end()) { - QPixmap *anim = *frames.at(currentFrame); + TQPixmap *anim = *frames.at(currentFrame); if (anim && !anim->isNull()) { // save the background for the other frames - bitBlt(&animBg, QPoint(0,0), pm, iconRect); + bitBlt(&animBg, TQPoint(0,0), pm, iconRect); // draw the animation frame bitBlt(pm, iconRect.x(), iconRect.y(), anim); } @@ -753,22 +753,22 @@ void TaskContainer::drawButton(QPainter *p) // draw popup arrow if (m_filteredTasks.count() > 1) { - QStyle::PrimitiveElement e = QStyle::PE_ArrowLeft; + TQStyle::PrimitiveElement e = TQStyle::PE_ArrowLeft; switch (arrowType) { - case Qt::LeftArrow: e = QStyle::PE_ArrowLeft; break; - case Qt::RightArrow: e = QStyle::PE_ArrowRight; break; - case Qt::UpArrow: e = QStyle::PE_ArrowUp; break; - case Qt::DownArrow: e = QStyle::PE_ArrowDown; break; + 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; } - int flags = QStyle::Style_Enabled; - QRect ar = QStyle::visualRect(QRect(br.x() + br.width() - 8 - 2, + int flags = TQStyle::Style_Enabled; + TQRect ar = TQStyle::visualRect(TQRect(br.x() + br.width() - 8 - 2, br.y(), 8, br.height()), this); if (sunken) { - flags |= QStyle::Style_Down; + flags |= TQStyle::Style_Down; } style().drawPrimitive(e, p, ar, colors, flags); @@ -776,7 +776,7 @@ void TaskContainer::drawButton(QPainter *p) // draw mouse over frame in transparent mode if (m_mouseOver && halo) - KickerLib::drawBlendedRect(p, QRect(0, 0, width(), height()), colorGroup().foreground()); + KickerLib::drawBlendedRect(p, TQRect(0, 0, width(), height()), colorGroup().foreground()); if (aboutToActivate) { @@ -784,10 +784,10 @@ void TaskContainer::drawButton(QPainter *p) } } -QString TaskContainer::name() +TQString TaskContainer::name() { // default to container id - QString text; + TQString text; // single task -> use mainwindow caption if (m_filteredTasks.count() == 1) @@ -798,7 +798,7 @@ QString TaskContainer::name() { // multiple tasks -> use the common part of all captions // if it is more descriptive than the class name - const QString match = m_filteredTasks.first()->visibleName(); + const TQString match = m_filteredTasks.first()->visibleName(); unsigned int maxLength = match.length(); unsigned int i = 0; bool stop = false; @@ -807,11 +807,11 @@ QString TaskContainer::name() // in common, and then use everything UP TO that as the name in the button while (i < maxLength) { - QChar check = match.at(i).lower(); + TQChar check = match.at(i).lower(); Task::List::iterator itEnd = m_filteredTasks.end(); for (Task::List::iterator it = m_filteredTasks.begin(); it != itEnd; ++it) { - // we're doing a lot of Utf8 -> QString conversions here + // we're doing a lot of Utf8 -> TQString conversions here // by repeatedly calling visibleIconicName() =/ if (check != (*it)->visibleName().at(i).lower()) { @@ -863,14 +863,14 @@ QString TaskContainer::name() // this is faster than (" [%1]").arg() or + // and it's as fast as using append, but cleaner looking text += " ["; - text += QString::number(m_filteredTasks.count()); + text += TQString::number(m_filteredTasks.count()); text += "]"; } return text; } -void TaskContainer::mousePressEvent( QMouseEvent* e ) +void TaskContainer::mousePressEvent( TQMouseEvent* e ) { if (discardNextMouseEvent) { @@ -884,7 +884,7 @@ void TaskContainer::mousePressEvent( QMouseEvent* e ) } else { - m_dragStartPos = QPoint(); + m_dragStartPos = TQPoint(); } int buttonAction = 0; @@ -913,9 +913,9 @@ void TaskContainer::mousePressEvent( QMouseEvent* e ) } } -void TaskContainer::mouseReleaseEvent(QMouseEvent *e) +void TaskContainer::mouseReleaseEvent(TQMouseEvent *e) { - m_dragStartPos = QPoint(); + m_dragStartPos = TQPoint(); if (!TaskBarSettings::drawButtons()) { @@ -926,7 +926,7 @@ void TaskContainer::mouseReleaseEvent(QMouseEvent *e) // button as unpressed just before it's activated. if (!rect().contains(e->pos())) { - QToolButton::mouseReleaseEvent(e); + TQToolButton::mouseReleaseEvent(e); return; } @@ -960,7 +960,7 @@ void TaskContainer::mouseReleaseEvent(QMouseEvent *e) } performAction( buttonAction ); - QTimer::singleShot(0, this, SLOT(update())); + TQTimer::singleShot(0, this, TQT_SLOT(update())); } void TaskContainer::performAction(int action) @@ -1130,7 +1130,7 @@ void TaskContainer::popupMenu(int action) } // calc popup menu position - QPoint pos(mapToGlobal(QPoint(0, 0))); + TQPoint pos(mapToGlobal(TQPoint(0, 0))); switch( arrowType ) { @@ -1141,12 +1141,12 @@ void TaskContainer::popupMenu(int action) pos.setX(pos.x() - m_menu->sizeHint().width()); break; case DownArrow: - if ( QApplication::reverseLayout() ) + if ( TQApplication::reverseLayout() ) pos.setX( pos.x() + width() - m_menu->sizeHint().width() ); pos.setY( pos.y() + height() ); break; case UpArrow: - if ( QApplication::reverseLayout() ) + if ( TQApplication::reverseLayout() ) pos.setX( pos.x() + width() - m_menu->sizeHint().width() ); pos.setY(pos.y() - m_menu->sizeHint().height()); break; @@ -1160,7 +1160,7 @@ void TaskContainer::popupMenu(int action) m_menu = 0; } -void TaskContainer::mouseMoveEvent( QMouseEvent* e ) +void TaskContainer::mouseMoveEvent( TQMouseEvent* e ) { kdDebug() << "regular move" << endl; if (!m_dragStartPos.isNull()) @@ -1168,10 +1168,10 @@ void TaskContainer::mouseMoveEvent( QMouseEvent* e ) startDrag(e->pos()); } - QToolButton::mouseMoveEvent(e); + TQToolButton::mouseMoveEvent(e); } -bool TaskContainer::startDrag(const QPoint& pos) +bool TaskContainer::startDrag(const TQPoint& pos) { if (m_filteredTasks.count() != 1) { @@ -1205,21 +1205,21 @@ bool TaskContainer::startDrag(const QPoint& pos) // This is the code that gives us the proper behavior // when a popup menu is displayed and we are clicked: // close the menu, and don't reopen it immediately. -// It's copied from QToolButton. Unfortunately Qt is lame +// It's copied from TQToolButton. Unfortunately Qt is lame // as usual and makes interesting stuff private or // non-virtual, so we have to copy code. -bool TaskContainer::eventFilter(QObject *o, QEvent *e) +bool TaskContainer::eventFilter(TQObject *o, TQEvent *e) { switch ( e->type() ) { - case QEvent::MouseButtonPress: - case QEvent::MouseButtonDblClick: + case TQEvent::MouseButtonPress: + case TQEvent::MouseButtonDblClick: { - QMouseEvent *me = (QMouseEvent*)e; - QPoint p = me->globalPos(); - if ( QApplication::widgetAt( p, true ) == this ) + TQMouseEvent *me = (TQMouseEvent*)e; + TQPoint p = me->globalPos(); + if ( TQApplication::widgetAt( p, true ) == this ) { - if (me->type() == QEvent::MouseButtonPress && + if (me->type() == TQEvent::MouseButtonPress && me->button() == LeftButton) { m_dragStartPos = mapFromGlobal(p); @@ -1229,25 +1229,25 @@ bool TaskContainer::eventFilter(QObject *o, QEvent *e) } break; } - case QEvent::MouseButtonRelease: + case TQEvent::MouseButtonRelease: { - m_dragStartPos = QPoint(); + m_dragStartPos = TQPoint(); break; } - case QEvent::MouseMove: + case TQEvent::MouseMove: { if (!m_dragStartPos.isNull()) { - QMouseEvent* me = static_cast(e); - QPoint p(me->globalPos()); + TQMouseEvent* me = static_cast(e); + TQPoint p(me->globalPos()); if (me->state() & LeftButton && - QApplication::widgetAt(p, true) == this) + TQApplication::widgetAt(p, true) == this) { kdDebug() << "event move" << endl; if (startDrag(mapFromGlobal(p))) { - QPopupMenu* menu = dynamic_cast(o); + TQPopupMenu* menu = dynamic_cast(o); if (menu) { @@ -1263,7 +1263,7 @@ bool TaskContainer::eventFilter(QObject *o, QEvent *e) break; } - return QToolButton::eventFilter( o, e ); + return TQToolButton::eventFilter( o, e ); } void TaskContainer::setArrowType( Qt::ArrowType at ) @@ -1277,19 +1277,19 @@ void TaskContainer::setArrowType( Qt::ArrowType at ) update(); } -void TaskContainer::publishIconGeometry( QPoint global ) +void TaskContainer::publishIconGeometry( TQPoint global ) { - QPoint p = global + geometry().topLeft(); + TQPoint p = global + geometry().topLeft(); Task::List::const_iterator itEnd = tasks.constEnd(); for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it) { Task::Ptr t = *it; - t->publishIconGeometry(QRect(p.x(), p.y(), width(), height())); + t->publishIconGeometry(TQRect(p.x(), p.y(), width(), height())); } } -void TaskContainer::dragEnterEvent( QDragEnterEvent* e ) +void TaskContainer::dragEnterEvent( TQDragEnterEvent* e ) { // ignore task drags and applet drags if (TaskDrag::canDecode(e) || PanelDrag::canDecode(e)) @@ -1310,37 +1310,37 @@ void TaskContainer::dragEnterEvent( QDragEnterEvent* e ) dragSwitchTimer.start(1000, true); } - QToolButton::dragEnterEvent( e ); + TQToolButton::dragEnterEvent( e ); } -void TaskContainer::dragLeaveEvent( QDragLeaveEvent* e ) +void TaskContainer::dragLeaveEvent( TQDragLeaveEvent* e ) { dragSwitchTimer.stop(); - QToolButton::dragLeaveEvent( e ); + TQToolButton::dragLeaveEvent( e ); } -void TaskContainer::enterEvent(QEvent* e) +void TaskContainer::enterEvent(TQEvent* e) { - QToolTip::remove(this); + TQToolTip::remove(this); m_mouseOver = true; updateNow(); if (tasks.isEmpty()) { - QToolButton::enterEvent(e); + TQToolButton::enterEvent(e); return; } if (!KickerSettings::showMouseOverEffects()) { - QString tooltip = "" + QStyleSheet::escape(name()) + ""; - QToolTip::add(this, tooltip); + TQString tooltip = "" + TQStyleSheet::escape(name()) + ""; + TQToolTip::add(this, tooltip); return; } } -void TaskContainer::leaveEvent(QEvent*) +void TaskContainer::leaveEvent(TQEvent*) { m_mouseOver = false; updateNow(); @@ -1458,14 +1458,14 @@ void TaskContainer::updateFilteredTaskList() } else { - t->publishIconGeometry( QRect()); + t->publishIconGeometry( TQRect()); } } // sort container list by desktop if (taskBar->sortByDesktop() && m_filteredTasks.count() > 1) { - QValueVector > sorted; + TQValueVector > sorted; sorted.resize(m_filteredTasks.count()); int i = 0; @@ -1480,7 +1480,7 @@ void TaskContainer::updateFilteredTaskList() qHeapSort(sorted); m_filteredTasks.clear(); - for (QValueVector >::iterator it = sorted.begin(); + for (TQValueVector >::iterator it = sorted.begin(); it != sorted.end(); ++it) { @@ -1525,9 +1525,9 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) return; } - QPixmap pixmap; - QString name; - QString details; + TQPixmap pixmap; + TQString name; + TQString details; if (m_filteredTasks.count() > 0) { @@ -1549,7 +1549,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) } // Collect all desktops the tasks are on. Sort naturally. - QMap desktopMap; + TQMap desktopMap; bool demandsAttention = false; bool modified = false; bool allDesktops = false; @@ -1587,8 +1587,8 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) } else { - QStringList desktopNames = desktopMap.values(); - details.append(i18n("On %1").arg(QStyleSheet::escape(desktopNames.join(", "))) + "
"); + TQStringList desktopNames = desktopMap.values(); + details.append(i18n("On %1").arg(TQStyleSheet::escape(desktopNames.join(", "))) + "
"); } } @@ -1602,7 +1602,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) { details.append(i18n("Has unsaved changes")); - static QString modStr = "[" + i18n( "modified" ) + "]"; + static TQString modStr = "[" + i18n( "modified" ) + "]"; int modStrPos = name.find(modStr); if (modStrPos >= 0) @@ -1613,7 +1613,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data) } } - data.message = QStyleSheet::escape(name); + data.message = TQStyleSheet::escape(name); data.subtext = details; data.icon = pixmap; data.direction = KickerLib::arrowToDirection(arrowType); @@ -1624,7 +1624,7 @@ void TaskContainer::finish() // Disconnect all signal/slot connections to avoid triggering a popupMenu() call, // whose event loop is the root of all (or at least much) evil. // Unfortunately, we can't just do "disconnect()", because that gets us a bunch - // of dangling QGuardedPtr objects (most notably in QTipManager.) (kling) + // of dangling TQGuardedPtr objects (most notably in QTipManager.) (kling) animationTimer.disconnect(); dragSwitchTimer.disconnect(); diff --git a/kicker/taskbar/taskcontainer.h b/kicker/taskbar/taskcontainer.h index 4328c36d4..567a74a79 100644 --- a/kicker/taskbar/taskcontainer.h +++ b/kicker/taskbar/taskcontainer.h @@ -25,28 +25,28 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __taskcontainer_h__ #define __taskcontainer_h__ -#include -#include -#include +#include +#include +#include #include "kickertip.h" #include "taskmanager.h" class TaskBar; -typedef QValueList PixmapList; +typedef TQValueList PixmapList; -class TaskContainer : public QToolButton, public KickerTip::Client +class TaskContainer : public TQToolButton, public KickerTip::Client { Q_OBJECT public: - typedef QValueList List; - typedef QValueList::iterator Iterator; + typedef TQValueList List; + typedef TQValueList::iterator Iterator; - TaskContainer(Task::Ptr, TaskBar*, QWidget *parent = 0, const char *name = 0); + TaskContainer(Task::Ptr, TaskBar*, TQWidget *parent = 0, const char *name = 0); TaskContainer(Startup::Ptr, PixmapList&, TaskBar*, - QWidget *parent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); virtual ~TaskContainer(); void setArrowType( Qt::ArrowType at ); @@ -66,17 +66,17 @@ public: bool isIconified(); bool isOnScreen(); - QString id(); + TQString id(); int desktop(); - QString name(); + TQString name(); - virtual QSizePolicy sizePolicy () const; + virtual TQSizePolicy sizePolicy () const; - void publishIconGeometry( QPoint ); + void publishIconGeometry( TQPoint ); void desktopChanged( int ); void windowChanged(Task::Ptr); void settingsChanged(); - bool eventFilter( QObject *o, QEvent *e ); + bool eventFilter( TQObject *o, TQEvent *e ); int taskCount() const { return tasks.count(); } int filteredTaskCount() const { return m_filteredTasks.count(); } @@ -96,17 +96,17 @@ signals: void showMe(TaskContainer*); protected: - void paintEvent(QPaintEvent*); - void drawButton(QPainter*); - void resizeEvent(QResizeEvent*); - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); - void dragEnterEvent(QDragEnterEvent*); - void dragLeaveEvent(QDragLeaveEvent*); - void enterEvent(QEvent*); - void leaveEvent(QEvent*); - bool startDrag(const QPoint& pos); + void paintEvent(TQPaintEvent*); + void drawButton(TQPainter*); + void resizeEvent(TQResizeEvent*); + void mousePressEvent(TQMouseEvent*); + void mouseReleaseEvent(TQMouseEvent*); + void mouseMoveEvent(TQMouseEvent*); + void dragEnterEvent(TQDragEnterEvent*); + void dragLeaveEvent(TQDragLeaveEvent*); + void enterEvent(TQEvent*); + void leaveEvent(TQEvent*); + bool startDrag(const TQPoint& pos); void stopTimers(); void performAction(int); @@ -125,20 +125,20 @@ protected slots: private: void checkAttention(const Task::Ptr changed_task = NULL); - QString sid; - QTimer animationTimer; - QTimer dragSwitchTimer; - QTimer attentionTimer; - QTimer m_paintEventCompressionTimer; + TQString sid; + TQTimer animationTimer; + TQTimer dragSwitchTimer; + TQTimer attentionTimer; + TQTimer m_paintEventCompressionTimer; int currentFrame; PixmapList frames; int attentionState; - QRect iconRect; - QPixmap animBg; + TQRect iconRect; + TQPixmap animBg; Task::List tasks; Task::List m_filteredTasks; Task::Ptr lastActivated; - QPopupMenu* m_menu; + TQPopupMenu* m_menu; Startup::Ptr m_startup; ArrowType arrowType; TaskBar* taskBar; @@ -147,7 +147,7 @@ private: bool m_mouseOver; bool m_paintEventCompression; enum { ATTENTION_BLINK_TIMEOUT = 4 }; - QPoint m_dragStartPos; + TQPoint m_dragStartPos; }; #endif -- cgit v1.2.1