diff options
Diffstat (limited to 'kwin-styles/riscos')
-rw-r--r-- | kwin-styles/riscos/AboveButton.cpp | 6 | ||||
-rw-r--r-- | kwin-styles/riscos/AboveButton.h | 4 | ||||
-rw-r--r-- | kwin-styles/riscos/Button.cpp | 30 | ||||
-rw-r--r-- | kwin-styles/riscos/Button.h | 18 | ||||
-rw-r--r-- | kwin-styles/riscos/CloseButton.cpp | 6 | ||||
-rw-r--r-- | kwin-styles/riscos/CloseButton.h | 4 | ||||
-rw-r--r-- | kwin-styles/riscos/HelpButton.cpp | 6 | ||||
-rw-r--r-- | kwin-styles/riscos/HelpButton.h | 4 | ||||
-rw-r--r-- | kwin-styles/riscos/IconifyButton.cpp | 6 | ||||
-rw-r--r-- | kwin-styles/riscos/IconifyButton.h | 4 | ||||
-rw-r--r-- | kwin-styles/riscos/LowerButton.cpp | 6 | ||||
-rw-r--r-- | kwin-styles/riscos/LowerButton.h | 4 | ||||
-rw-r--r-- | kwin-styles/riscos/Manager.cpp | 150 | ||||
-rw-r--r-- | kwin-styles/riscos/Manager.h | 34 | ||||
-rw-r--r-- | kwin-styles/riscos/MaximiseButton.cpp | 16 | ||||
-rw-r--r-- | kwin-styles/riscos/MaximiseButton.h | 4 | ||||
-rw-r--r-- | kwin-styles/riscos/Palette.h | 6 | ||||
-rw-r--r-- | kwin-styles/riscos/Static.cpp | 64 | ||||
-rw-r--r-- | kwin-styles/riscos/Static.h | 32 | ||||
-rw-r--r-- | kwin-styles/riscos/StickyButton.cpp | 16 | ||||
-rw-r--r-- | kwin-styles/riscos/StickyButton.h | 4 |
21 files changed, 212 insertions, 212 deletions
diff --git a/kwin-styles/riscos/AboveButton.cpp b/kwin-styles/riscos/AboveButton.cpp index 738b7f79..7b66e3ba 100644 --- a/kwin-styles/riscos/AboveButton.cpp +++ b/kwin-styles/riscos/AboveButton.cpp @@ -44,13 +44,13 @@ static const char * const above_xpm[] = { " ..... ", " "}; -AboveButton::AboveButton(QWidget *parent) +AboveButton::AboveButton(TQWidget *parent) : Button(parent, i18n("Keep above others")) { - setPixmap(QPixmap((const char **)above_xpm)); + setPixmap(TQPixmap((const char **)above_xpm)); } -void AboveButton::mouseReleaseEvent(QMouseEvent *e) +void AboveButton::mouseReleaseEvent(TQMouseEvent *e) { Button::mouseReleaseEvent(e); diff --git a/kwin-styles/riscos/AboveButton.h b/kwin-styles/riscos/AboveButton.h index b7a910ec..9ea0e005 100644 --- a/kwin-styles/riscos/AboveButton.h +++ b/kwin-styles/riscos/AboveButton.h @@ -34,7 +34,7 @@ class AboveButton : public Button public: - AboveButton(QWidget *parent); + AboveButton(TQWidget *parent); signals: @@ -42,7 +42,7 @@ class AboveButton : public Button protected: - void mouseReleaseEvent(QMouseEvent*); + void mouseReleaseEvent(TQMouseEvent*); }; } // End namespace diff --git a/kwin-styles/riscos/Button.cpp b/kwin-styles/riscos/Button.cpp index d4da6ecc..d126ced1 100644 --- a/kwin-styles/riscos/Button.cpp +++ b/kwin-styles/riscos/Button.cpp @@ -20,23 +20,23 @@ Boston, MA 02110-1301, USA. */ -#include <qtooltip.h> +#include <tqtooltip.h> #include "Button.h" #include "Static.h" namespace RiscOS { -Button::Button(QWidget *parent, const QString& tip, +Button::Button(TQWidget *parent, const TQString& tip, const ButtonState realizeButtons) - : QWidget(parent, "Button", 0), + : TQWidget(parent, "Button", 0), realizeButtons_(realizeButtons), lastButton_(NoButton), alignment_(Left), down_ (false), active_ (false) { - QToolTip::add(this, tip); + TQToolTip::add(this, tip); setBackgroundColor(Qt::black); setFixedSize(Static::instance()->titleHeight() - 1, @@ -65,32 +65,32 @@ Button::Alignment Button::alignment() const return alignment_; } -void Button::mousePressEvent(QMouseEvent *e) +void Button::mousePressEvent(TQMouseEvent *e) { down_ = true; lastButton_ = e->button(); repaint(); - QMouseEvent me(e->type(), e->pos(), e->globalPos(), + TQMouseEvent me(e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons_) ? LeftButton : NoButton, e->state()); - QWidget::mousePressEvent(&me); + TQWidget::mousePressEvent(&me); } -void Button::mouseReleaseEvent(QMouseEvent *e) +void Button::mouseReleaseEvent(TQMouseEvent *e) { down_ = false; lastButton_ = e->button(); repaint(); - QMouseEvent me(e->type(), e->pos(), e->globalPos(), + TQMouseEvent me(e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons_) ? LeftButton : NoButton, e->state()); - QWidget::mouseReleaseEvent(&me); + TQWidget::mouseReleaseEvent(&me); } -void Button::setPixmap(const QPixmap &p) +void Button::setPixmap(const TQPixmap &p) { - if (QPixmap::defaultDepth() <= 8) + if (TQPixmap::defaultDepth() <= 8) aPixmap_ = iPixmap_ = p; else { @@ -98,8 +98,8 @@ void Button::setPixmap(const QPixmap &p) QRgb* data = NULL; QRgb w = qRgb(255, 255, 255); - QImage aTx(p.convertToImage()); - QImage iTx(aTx.copy()); + TQImage aTx(p.convertToImage()); + TQImage iTx(aTx.copy()); const KDecorationOptions* options = KDecoration::options(); light = options->color(KDecoration::ColorButtonBg, true).light(150).rgb(); @@ -136,7 +136,7 @@ void Button::setPixmap(const QPixmap &p) repaint(); } -void Button::paintEvent(QPaintEvent *) +void Button::paintEvent(TQPaintEvent *) { bitBlt(this, alignment_ == Left ? 1 : 0, 0, &Static::instance()->buttonBase(active_, down_)); diff --git a/kwin-styles/riscos/Button.h b/kwin-styles/riscos/Button.h index 1289a2fa..fc29e205 100644 --- a/kwin-styles/riscos/Button.h +++ b/kwin-styles/riscos/Button.h @@ -23,8 +23,8 @@ #ifndef RISC_OS_BUTTON_H #define RISC_OS_BUTTON_H -#include <qpixmap.h> -#include <qwidget.h> +#include <tqpixmap.h> +#include <tqwidget.h> #include <klocale.h> #include <kdecoration.h> @@ -41,7 +41,7 @@ class Button : public QWidget enum Alignment { Left, Right }; - Button(QWidget *parent, const QString &tip, + Button(TQWidget *parent, const TQString &tip, const ButtonState realizeButton = LeftButton); virtual ~Button(); @@ -55,13 +55,13 @@ class Button : public QWidget protected: - void paintEvent(QPaintEvent *); + void paintEvent(TQPaintEvent *); - void mousePressEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *) { /* Empty. */ } + void mousePressEvent(TQMouseEvent *); + void mouseReleaseEvent(TQMouseEvent *); + void mouseMoveEvent(TQMouseEvent *) { /* Empty. */ } - void setPixmap(const QPixmap &); + void setPixmap(const TQPixmap &); ButtonState realizeButtons_; ButtonState lastButton_; @@ -71,7 +71,7 @@ class Button : public QWidget Alignment alignment_; bool down_; bool active_; - QPixmap aPixmap_, iPixmap_; + TQPixmap aPixmap_, iPixmap_; }; } // End namespace diff --git a/kwin-styles/riscos/CloseButton.cpp b/kwin-styles/riscos/CloseButton.cpp index 4f2066cf..1a4c06b5 100644 --- a/kwin-styles/riscos/CloseButton.cpp +++ b/kwin-styles/riscos/CloseButton.cpp @@ -44,13 +44,13 @@ static const char * const close_xpm[] = { " .+. .+. ", " . . "}; -CloseButton::CloseButton(QWidget *parent) +CloseButton::CloseButton(TQWidget *parent) : Button(parent, i18n("Close")) { - setPixmap(QPixmap((const char **)close_xpm)); + setPixmap(TQPixmap((const char **)close_xpm)); } -void CloseButton::mouseReleaseEvent(QMouseEvent *e) +void CloseButton::mouseReleaseEvent(TQMouseEvent *e) { Button::mouseReleaseEvent(e); diff --git a/kwin-styles/riscos/CloseButton.h b/kwin-styles/riscos/CloseButton.h index 73791b76..b9173c14 100644 --- a/kwin-styles/riscos/CloseButton.h +++ b/kwin-styles/riscos/CloseButton.h @@ -34,7 +34,7 @@ class CloseButton : public Button public: - CloseButton(QWidget *parent); + CloseButton(TQWidget *parent); signals: @@ -42,7 +42,7 @@ class CloseButton : public Button protected: - void mouseReleaseEvent(QMouseEvent *); + void mouseReleaseEvent(TQMouseEvent *); }; } // End namespace; diff --git a/kwin-styles/riscos/HelpButton.cpp b/kwin-styles/riscos/HelpButton.cpp index a3d36668..936738eb 100644 --- a/kwin-styles/riscos/HelpButton.cpp +++ b/kwin-styles/riscos/HelpButton.cpp @@ -44,13 +44,13 @@ static const char * const help_xpm[] = { " + ++ ", " ++ "}; -HelpButton::HelpButton(QWidget *parent) +HelpButton::HelpButton(TQWidget *parent) : Button(parent, i18n("Help")) { - setPixmap(QPixmap((const char **)help_xpm)); + setPixmap(TQPixmap((const char **)help_xpm)); } -void HelpButton::mouseReleaseEvent(QMouseEvent *e) +void HelpButton::mouseReleaseEvent(TQMouseEvent *e) { Button::mouseReleaseEvent(e); diff --git a/kwin-styles/riscos/HelpButton.h b/kwin-styles/riscos/HelpButton.h index 89d76453..f825a05b 100644 --- a/kwin-styles/riscos/HelpButton.h +++ b/kwin-styles/riscos/HelpButton.h @@ -34,7 +34,7 @@ class HelpButton : public Button public: - HelpButton(QWidget *parent); + HelpButton(TQWidget *parent); signals: @@ -42,7 +42,7 @@ class HelpButton : public Button protected: - void mouseReleaseEvent(QMouseEvent *); + void mouseReleaseEvent(TQMouseEvent *); }; } // End namespace; diff --git a/kwin-styles/riscos/IconifyButton.cpp b/kwin-styles/riscos/IconifyButton.cpp index 760194f5..b5eef9e5 100644 --- a/kwin-styles/riscos/IconifyButton.cpp +++ b/kwin-styles/riscos/IconifyButton.cpp @@ -44,13 +44,13 @@ static const char * const iconify_xpm[] = { " ", " "}; -IconifyButton::IconifyButton(QWidget *parent) +IconifyButton::IconifyButton(TQWidget *parent) : Button(parent, i18n("Minimize")) { - setPixmap(QPixmap((const char **)iconify_xpm)); + setPixmap(TQPixmap((const char **)iconify_xpm)); } -void IconifyButton::mouseReleaseEvent(QMouseEvent *e) +void IconifyButton::mouseReleaseEvent(TQMouseEvent *e) { Button::mouseReleaseEvent(e); diff --git a/kwin-styles/riscos/IconifyButton.h b/kwin-styles/riscos/IconifyButton.h index 9c940713..8f757cb4 100644 --- a/kwin-styles/riscos/IconifyButton.h +++ b/kwin-styles/riscos/IconifyButton.h @@ -34,7 +34,7 @@ class IconifyButton : public Button public: - IconifyButton(QWidget *parent); + IconifyButton(TQWidget *parent); signals: @@ -42,7 +42,7 @@ class IconifyButton : public Button protected: - void mouseReleaseEvent(QMouseEvent *); + void mouseReleaseEvent(TQMouseEvent *); }; } // End namespace; diff --git a/kwin-styles/riscos/LowerButton.cpp b/kwin-styles/riscos/LowerButton.cpp index a14c6149..7f03e41f 100644 --- a/kwin-styles/riscos/LowerButton.cpp +++ b/kwin-styles/riscos/LowerButton.cpp @@ -44,13 +44,13 @@ static const char * const lower_xpm[] = { " ..... ", " "}; -LowerButton::LowerButton(QWidget *parent) +LowerButton::LowerButton(TQWidget *parent) : Button(parent, i18n("Keep below others")) { - setPixmap(QPixmap((const char **)lower_xpm)); + setPixmap(TQPixmap((const char **)lower_xpm)); } -void LowerButton::mouseReleaseEvent(QMouseEvent *e) +void LowerButton::mouseReleaseEvent(TQMouseEvent *e) { Button::mouseReleaseEvent(e); diff --git a/kwin-styles/riscos/LowerButton.h b/kwin-styles/riscos/LowerButton.h index ec5ab474..f3fc4df1 100644 --- a/kwin-styles/riscos/LowerButton.h +++ b/kwin-styles/riscos/LowerButton.h @@ -34,7 +34,7 @@ class LowerButton : public Button public: - LowerButton(QWidget *parent); + LowerButton(TQWidget *parent); signals: @@ -42,7 +42,7 @@ class LowerButton : public Button protected: - void mouseReleaseEvent(QMouseEvent *); + void mouseReleaseEvent(TQMouseEvent *); }; } // End namespace; diff --git a/kwin-styles/riscos/Manager.cpp b/kwin-styles/riscos/Manager.cpp index a890ac63..c4b77f0a 100644 --- a/kwin-styles/riscos/Manager.cpp +++ b/kwin-styles/riscos/Manager.cpp @@ -24,11 +24,11 @@ #include <config.h> // for usleep on non-linux platforms #include <math.h> // for sin and cos -#include <qapplication.h> -#include <qimage.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpainter.h> +#include <tqapplication.h> +#include <tqimage.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpainter.h> #include <netwm.h> @@ -80,37 +80,37 @@ void Manager::init() resetLayout(); } -bool Manager::eventFilter(QObject *o, QEvent *e) +bool Manager::eventFilter(TQObject *o, TQEvent *e) { if (o != widget()) return false; switch (e->type()) { - case QEvent::Resize: - resizeEvent(static_cast<QResizeEvent*>(e)); + case TQEvent::Resize: + resizeEvent(static_cast<TQResizeEvent*>(e)); return true; - case QEvent::Paint: - paintEvent(static_cast<QPaintEvent*>(e)); + case TQEvent::Paint: + paintEvent(static_cast<TQPaintEvent*>(e)); return true; - case QEvent::MouseButtonDblClick: - mouseDoubleClickEvent(static_cast<QMouseEvent*>(e)); + case TQEvent::MouseButtonDblClick: + mouseDoubleClickEvent(static_cast<TQMouseEvent*>(e)); return true; - case QEvent::MouseButtonPress: - processMousePressEvent(static_cast<QMouseEvent*>(e)); + case TQEvent::MouseButtonPress: + processMousePressEvent(static_cast<TQMouseEvent*>(e)); return true; - case QEvent::Wheel: - wheelEvent( static_cast< QWheelEvent* >( e )); + case TQEvent::Wheel: + wheelEvent( static_cast< TQWheelEvent* >( e )); return true; - case QEvent::MouseButtonRelease: + case TQEvent::MouseButtonRelease: return false; - case QEvent::Show: + case TQEvent::Show: return false; - case QEvent::MouseMove: + case TQEvent::MouseMove: return false; - case QEvent::Enter: + case TQEvent::Enter: return false; - case QEvent::Leave: + case TQEvent::Leave: return false; - case QEvent::Move: + case TQEvent::Move: return false; default: return false; @@ -129,12 +129,12 @@ void Manager::borders(int &left, int &right, int &top, int &bottom) const bottom = isResizable() ? Static::instance()->resizeHeight() : 1; } -void Manager::resize(const QSize &s) +void Manager::resize(const TQSize &s) { widget()->resize(s); } -QSize Manager::minimumSize() const +TQSize Manager::minimumSize() const { return widget()->minimumSize(); } @@ -169,16 +169,16 @@ void Manager::shadeChange() { } -void Manager::paintEvent(QPaintEvent *e) +void Manager::paintEvent(TQPaintEvent *e) { - QPainter p(widget()); + TQPainter p(widget()); - QRect r(e->rect()); + TQRect r(e->rect()); - bool intersectsLeft = r.intersects(QRect(0, 0, 1, height())); + bool intersectsLeft = r.intersects(TQRect(0, 0, 1, height())); bool intersectsRight = - r.intersects(QRect(width() - 1, 0, width(), height())); + r.intersects(TQRect(width() - 1, 0, width(), height())); if (intersectsLeft || intersectsRight) { @@ -197,7 +197,7 @@ void Manager::paintEvent(QPaintEvent *e) // Title bar. - QRect tr = titleSpacer_->geometry(); + TQRect tr = titleSpacer_->geometry(); bitBlt(widget(), tr.topLeft(), &titleBuf_); // Resize bar. @@ -220,7 +220,7 @@ void Manager::paintEvent(QPaintEvent *e) p.drawLine(1, height() - 1, width() - 2, height() - 1); } -void Manager::resizeEvent(QResizeEvent*) +void Manager::resizeEvent(TQResizeEvent*) { updateButtonVisibility(); updateTitleBuffer(); @@ -292,14 +292,14 @@ void Manager::updateTitleBuffer() Static * s = Static::instance(); - QRect tr = titleSpacer_->geometry(); + TQRect tr = titleSpacer_->geometry(); if (tr.width() == 0 || tr.height() == 0) titleBuf_.resize(8, 8); else titleBuf_.resize(tr.size()); - QPainter p(&titleBuf_); + TQPainter p(&titleBuf_); p.drawPixmap(0, 0, s->titleTextLeft(active)); @@ -316,7 +316,7 @@ void Manager::updateTitleBuffer() p.drawPixmap(tr.width() - 3, 0, s->titleTextRight(active)); } -KDecoration::Position Manager::mousePosition(const QPoint& p) const +KDecoration::Position Manager::mousePosition(const TQPoint& p) const { Position m = PositionCenter; @@ -350,19 +350,19 @@ KDecoration::Position Manager::mousePosition(const QPoint& p) const return m; } -void Manager::mouseDoubleClickEvent(QMouseEvent *e) +void Manager::mouseDoubleClickEvent(TQMouseEvent *e) { if (e->button() == LeftButton && titleSpacer_->geometry().contains(e->pos())) titlebarDblClickOperation(); } -void Manager::wheelEvent(QWheelEvent *e) +void Manager::wheelEvent(TQWheelEvent *e) { if (isSetShade() || titleLayout_->geometry().contains(e->pos()) ) titlebarMouseWheelOperation( e->delta()); } -void Manager::paletteChange(const QPalette &) +void Manager::paletteChange(const TQPalette &) { resetLayout(); } @@ -430,7 +430,7 @@ bool Manager::animateMinimize(bool iconify) helperShowHide(false); qApp->syncX(); - QRect r = iconGeometry(); + TQRect r = iconGeometry(); if (!r.isValid()) return true; @@ -462,7 +462,7 @@ bool Manager::animateMinimize(bool iconify) double delta = finalAngle / steps; - QPainter p(workspaceWidget()); + TQPainter p(workspaceWidget()); p.setRasterOp(Qt::NotROP); for (double angle = 0; ; angle += delta) @@ -474,10 +474,10 @@ bool Manager::animateMinimize(bool iconify) double dch = (ch / 2) * cos(angle); double midy = cy + (ch / 2); - QPoint p1(int(cx + dx), int(midy - dch)); - QPoint p2(int(cx + cw - dx), p1.y()); - QPoint p3(int(cx + dw + dx), int(midy + dch)); - QPoint p4(int(cx - dx), p3.y()); + TQPoint p1(int(cx + dx), int(midy - dch)); + TQPoint p2(int(cx + cw - dx), p1.y()); + TQPoint p3(int(cx + dw + dx), int(midy + dch)); + TQPoint p4(int(cx - dx), p3.y()); grabXServer(); @@ -521,12 +521,12 @@ bool Manager::animateMinimize(bool iconify) int stepCount = 12; - QRect r(geometry()); + TQRect r(geometry()); int dx = r.width() / (stepCount * 2); int dy = r.height() / (stepCount * 2); - QPainter p(workspaceWidget()); + TQPainter p(workspaceWidget()); p.setRasterOp(Qt::NotROP); for (int step = 0; step < stepCount; step++) @@ -550,19 +550,19 @@ bool Manager::animateMinimize(bool iconify) default: { - QRect icongeom = iconGeometry(); + TQRect icongeom = iconGeometry(); if (!icongeom.isValid()) return true; - QRect wingeom = geometry(); + TQRect wingeom = geometry(); - QPainter p(workspaceWidget()); + TQPainter p(workspaceWidget()); p.setRasterOp(Qt::NotROP); #if 0 if (iconify) - p.setClipRegion(QRegion(workspaceWidget()->rect()) - wingeom); + p.setClipRegion(TQRegion(workspaceWidget()->rect()) - wingeom); #endif grabXServer(); @@ -594,7 +594,7 @@ void Manager::createTitle() leftButtonList_.clear(); rightButtonList_.clear(); - QString buttons; + TQString buttons; if (options()->customButtonPositions()) buttons = options()->titleButtonsLeft() + "|" + @@ -602,7 +602,7 @@ void Manager::createTitle() else buttons = "XSH|IA"; - QPtrList<Button> *buttonList = &leftButtonList_; + TQPtrList<Button> *buttonList = &leftButtonList_; for (unsigned int i = 0; i < buttons.length(); ++i) { @@ -612,9 +612,9 @@ void Manager::createTitle() { case 'S': // Sticky tb = new StickyButton(widget()); - connect(this, SIGNAL(stickyChanged(bool)), - tb, SLOT(setOn(bool))); - connect(tb, SIGNAL(toggleSticky()), this, SLOT(slotToggleSticky())); + connect(this, TQT_SIGNAL(stickyChanged(bool)), + tb, TQT_SLOT(setOn(bool))); + connect(tb, TQT_SIGNAL(toggleSticky()), this, TQT_SLOT(slotToggleSticky())); emit(stickyChanged(isOnAllDesktops())); break; @@ -622,7 +622,7 @@ void Manager::createTitle() if (providesContextHelp()) { tb = new HelpButton(widget()); - connect(tb, SIGNAL(help()), this, SLOT(showContextHelp())); + connect(tb, TQT_SIGNAL(help()), this, TQT_SLOT(showContextHelp())); } break; @@ -630,7 +630,7 @@ void Manager::createTitle() if (isMinimizable()) { tb = new IconifyButton(widget()); - connect(tb, SIGNAL(iconify()), this, SLOT(minimize())); + connect(tb, TQT_SIGNAL(iconify()), this, TQT_SLOT(minimize())); } break; @@ -638,29 +638,29 @@ void Manager::createTitle() if (isMaximizable()) { tb = new MaximiseButton(widget()); - connect(tb, SIGNAL(maximizeClicked(ButtonState)), - this, SLOT(slotMaximizeClicked(ButtonState))); - connect(this, SIGNAL(maximizeChanged(bool)), - tb, SLOT(setOn(bool))); + connect(tb, TQT_SIGNAL(maximizeClicked(ButtonState)), + this, TQT_SLOT(slotMaximizeClicked(ButtonState))); + connect(this, TQT_SIGNAL(maximizeChanged(bool)), + tb, TQT_SLOT(setOn(bool))); emit(maximizeChanged(maximizeMode() == MaximizeFull)); } break; case 'F': // Above tb = new AboveButton(widget()); - connect(tb, SIGNAL(above()), this, SLOT(slotAbove())); + connect(tb, TQT_SIGNAL(above()), this, TQT_SLOT(slotAbove())); break; case 'B': // Lower tb = new LowerButton(widget()); - connect(tb, SIGNAL(lower()), this, SLOT(slotLower())); + connect(tb, TQT_SIGNAL(lower()), this, TQT_SLOT(slotLower())); break; case 'X': // Close if (isCloseable()) { tb = new CloseButton(widget()); - connect(tb, SIGNAL(closeWindow()), this, SLOT(closeWindow())); + connect(tb, TQT_SIGNAL(closeWindow()), this, TQT_SLOT(closeWindow())); } break; @@ -671,23 +671,23 @@ void Manager::createTitle() if (tb != NULL) { - connect(this, SIGNAL(activeChanged(bool)), tb, SLOT(setActive(bool))); + connect(this, TQT_SIGNAL(activeChanged(bool)), tb, TQT_SLOT(setActive(bool))); buttonList->append(tb); } } - for (QPtrListIterator<Button> it(leftButtonList_); it.current(); ++it) + for (TQPtrListIterator<Button> it(leftButtonList_); it.current(); ++it) { it.current()->setAlignment(Button::Left); titleLayout_->addWidget(it.current()); } - titleSpacer_ = new QSpacerItem(0, Static::instance()->titleHeight(), - QSizePolicy::Expanding, QSizePolicy::Fixed); + titleSpacer_ = new TQSpacerItem(0, Static::instance()->titleHeight(), + TQSizePolicy::Expanding, TQSizePolicy::Fixed); titleLayout_->addItem(titleSpacer_); - for (QPtrListIterator<Button> it(rightButtonList_); it.current(); ++it) + for (TQPtrListIterator<Button> it(rightButtonList_); it.current(); ++it) { it.current()->setAlignment(Button::Right); titleLayout_->addWidget(it.current()); @@ -697,21 +697,21 @@ void Manager::createTitle() void Manager::resetLayout() { delete topLayout_; - topLayout_ = new QVBoxLayout(widget(), 0, 0); - topLayout_->setResizeMode(QLayout::FreeResize); + topLayout_ = new TQVBoxLayout(widget(), 0, 0); + topLayout_->setResizeMode(TQLayout::FreeResize); - titleLayout_ = new QBoxLayout(topLayout_, QBoxLayout::LeftToRight, 0, 0); - titleLayout_->setResizeMode(QLayout::FreeResize); + titleLayout_ = new TQBoxLayout(topLayout_, TQBoxLayout::LeftToRight, 0, 0); + titleLayout_->setResizeMode(TQLayout::FreeResize); createTitle(); - QBoxLayout *midLayout = new QBoxLayout(topLayout_, QBoxLayout::LeftToRight, + TQBoxLayout *midLayout = new TQBoxLayout(topLayout_, TQBoxLayout::LeftToRight, 0, 0); - midLayout->setResizeMode(QLayout::FreeResize); + midLayout->setResizeMode(TQLayout::FreeResize); midLayout->addSpacing(1); if (isPreview()) midLayout->addWidget( - new QLabel(i18n("<center><b>RiscOS preview</b></center>"), widget())); + new TQLabel(i18n("<center><b>RiscOS preview</b></center>"), widget())); midLayout->addSpacing(1); if (isResizable()) diff --git a/kwin-styles/riscos/Manager.h b/kwin-styles/riscos/Manager.h index 1d30b7a6..c5269051 100644 --- a/kwin-styles/riscos/Manager.h +++ b/kwin-styles/riscos/Manager.h @@ -23,7 +23,7 @@ #ifndef RISC_OS_MANAGER_H #define RISC_OS_MANAGER_H -#include <qdict.h> +#include <tqdict.h> #include <kdecoration.h> #include <kdecorationfactory.h> @@ -51,11 +51,11 @@ class Manager : public KDecoration Manager(KDecorationBridge*, KDecorationFactory*); ~Manager(); void init(); - bool eventFilter(QObject*, QEvent*); + bool eventFilter(TQObject*, TQEvent*); void reset(unsigned long changed); void borders(int&, int&, int&, int&) const; - void resize(const QSize&); - QSize minimumSize() const; + void resize(const TQSize&); + TQSize minimumSize() const; void activeChange(); void captionChange(); void iconChange(); @@ -78,14 +78,14 @@ class Manager : public KDecoration protected: - KDecoration::Position mousePosition(const QPoint &) const; - void paletteChange(const QPalette &); + KDecoration::Position mousePosition(const TQPoint &) const; + void paletteChange(const TQPalette &); void activeChange(bool); void stickyChange(bool); - void paintEvent(QPaintEvent *); - void resizeEvent(QResizeEvent *); - void mouseDoubleClickEvent(QMouseEvent *); - void wheelEvent(QWheelEvent *e); + void paintEvent(TQPaintEvent *); + void resizeEvent(TQResizeEvent *); + void mouseDoubleClickEvent(TQMouseEvent *); + void wheelEvent(TQWheelEvent *e); bool animateMinimize(bool); void updateButtonVisibility(); void updateTitleBuffer(); @@ -95,16 +95,16 @@ class Manager : public KDecoration private: - QVBoxLayout *topLayout_; - QBoxLayout *titleLayout_; - QSpacerItem *titleSpacer_; + TQVBoxLayout *topLayout_; + TQBoxLayout *titleLayout_; + TQSpacerItem *titleSpacer_; - QPixmap titleBuf_; - QPtrList<Button> leftButtonList_; - QPtrList<Button> rightButtonList_; + TQPixmap titleBuf_; + TQPtrList<Button> leftButtonList_; + TQPtrList<Button> rightButtonList_; }; -class Factory : public QObject, public KDecorationFactory +class Factory : public TQObject, public KDecorationFactory { Q_OBJECT diff --git a/kwin-styles/riscos/MaximiseButton.cpp b/kwin-styles/riscos/MaximiseButton.cpp index b82f2867..ebfb6628 100644 --- a/kwin-styles/riscos/MaximiseButton.cpp +++ b/kwin-styles/riscos/MaximiseButton.cpp @@ -22,7 +22,7 @@ #include "MaximiseButton.h" -#include <qtooltip.h> +#include <tqtooltip.h> namespace RiscOS { @@ -65,25 +65,25 @@ static const char * const unmaximise_xpm[] = { " ", " "}; -MaximiseButton::MaximiseButton(QWidget * parent) +MaximiseButton::MaximiseButton(TQWidget * parent) : Button(parent, i18n("Maximize"), (ButtonState)(LeftButton|MidButton|RightButton)), on_(false) { - setPixmap(QPixmap((const char **)maximise_xpm)); + setPixmap(TQPixmap((const char **)maximise_xpm)); } void MaximiseButton::setOn(bool on) { on_ = on; - setPixmap(on_ ? QPixmap((const char **)unmaximise_xpm) - : QPixmap((const char **)maximise_xpm)); + setPixmap(on_ ? TQPixmap((const char **)unmaximise_xpm) + : TQPixmap((const char **)maximise_xpm)); repaint(); - QToolTip::remove(this); - QToolTip::add(this, on_ ? i18n("Restore") : i18n("Maximize")); + TQToolTip::remove(this); + TQToolTip::add(this, on_ ? i18n("Restore") : i18n("Maximize")); } -void MaximiseButton::mouseReleaseEvent(QMouseEvent *e) +void MaximiseButton::mouseReleaseEvent(TQMouseEvent *e) { Button::mouseReleaseEvent(e); diff --git a/kwin-styles/riscos/MaximiseButton.h b/kwin-styles/riscos/MaximiseButton.h index 7da4bc0a..ff715ba1 100644 --- a/kwin-styles/riscos/MaximiseButton.h +++ b/kwin-styles/riscos/MaximiseButton.h @@ -34,7 +34,7 @@ class MaximiseButton : public Button public: - MaximiseButton(QWidget *parent); + MaximiseButton(TQWidget *parent); public slots: @@ -46,7 +46,7 @@ class MaximiseButton : public Button protected: - void mouseReleaseEvent(QMouseEvent *); + void mouseReleaseEvent(TQMouseEvent *); private: diff --git a/kwin-styles/riscos/Palette.h b/kwin-styles/riscos/Palette.h index e13457a6..260175b9 100644 --- a/kwin-styles/riscos/Palette.h +++ b/kwin-styles/riscos/Palette.h @@ -23,8 +23,8 @@ #ifndef RISC_OS_PALETTE_H #define RISC_OS_PALETTE_H -#include <qmemarray.h> -#include <qglobal.h> +#include <tqmemarray.h> +#include <tqglobal.h> namespace RiscOS { @@ -59,7 +59,7 @@ class Palette private: - QMemArray<QRgb> data_; + TQMemArray<QRgb> data_; }; } // End namespace diff --git a/kwin-styles/riscos/Static.cpp b/kwin-styles/riscos/Static.cpp index 675cdfc1..5c6e427d 100644 --- a/kwin-styles/riscos/Static.cpp +++ b/kwin-styles/riscos/Static.cpp @@ -25,10 +25,10 @@ #undef Bool #endif -#include <qimage.h> -#include <qpixmap.h> -#include <qpainter.h> -#include <qptrlist.h> +#include <tqimage.h> +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqptrlist.h> #include <kdecoration.h> @@ -71,37 +71,37 @@ Static::~Static() instance_ = NULL; } -const QPixmap& Static::titleTextLeft(bool active) const +const TQPixmap& Static::titleTextLeft(bool active) const { return active ? aTitleTextLeft_ : iTitleTextLeft_; } -const QPixmap& Static::titleTextRight(bool active) const +const TQPixmap& Static::titleTextRight(bool active) const { return active ? aTitleTextRight_ : iTitleTextRight_; } -const QPixmap& Static::resizeMidLeft(bool active) const +const TQPixmap& Static::resizeMidLeft(bool active) const { return active ? aResizeMidLeft_ : iResizeMidLeft_; } -const QPixmap& Static::resizeMidRight(bool active) const +const TQPixmap& Static::resizeMidRight(bool active) const { return active ? aResizeMidRight_ : iResizeMidRight_; } -const QPixmap& Static::titleTextMid(bool active) const +const TQPixmap& Static::titleTextMid(bool active) const { return active ? aTitleTextMid_ : iTitleTextMid_; } -const QPixmap& Static::resizeMidMid(bool active) const +const TQPixmap& Static::resizeMidMid(bool active) const { return active ? aResizeMid_ : iResizeMid_; } -const QPixmap& Static::resize(bool active) const +const TQPixmap& Static::resize(bool active) const { return active ? aResize_ : iResize_; } @@ -121,7 +121,7 @@ int Static::resizeHeight() const return resizeHeight_; } -void Static::_drawBorder(QPixmap &pix, int w, int h) +void Static::_drawBorder(TQPixmap &pix, int w, int h) { // 0111111113 // 1122222235 @@ -134,14 +134,14 @@ void Static::_drawBorder(QPixmap &pix, int w, int h) painter_.begin(&pix); painter_.translate(transx, transy); - QColor c0 = down_ ? palette_[7] : palette_[0]; - QColor c1 = down_ ? palette_[6] : palette_[1]; - QColor c2 = down_ ? palette_[5] : palette_[2]; - QColor c3 = down_ ? palette_[4] : palette_[3]; - QColor c4 = down_ ? palette_[3] : palette_[4]; - QColor c5 = down_ ? palette_[2] : palette_[5]; - QColor c6 = down_ ? palette_[2] : palette_[6]; - QColor c7 = down_ ? palette_[1] : palette_[7]; + TQColor c0 = down_ ? palette_[7] : palette_[0]; + TQColor c1 = down_ ? palette_[6] : palette_[1]; + TQColor c2 = down_ ? palette_[5] : palette_[2]; + TQColor c3 = down_ ? palette_[4] : palette_[3]; + TQColor c4 = down_ ? palette_[3] : palette_[4]; + TQColor c5 = down_ ? palette_[2] : palette_[5]; + TQColor c6 = down_ ? palette_[2] : palette_[6]; + TQColor c7 = down_ ? palette_[1] : palette_[7]; painter_.setPen(c0); painter_.drawPoint(0, 0); @@ -183,7 +183,7 @@ void Static::_drawBorder(QPixmap &pix, int w, int h) painter_.resetXForm(); } -void setPalette(Palette &pal, QColor c) +void setPalette(Palette &pal, TQColor c) { pal[3] = c.rgb(); @@ -204,7 +204,7 @@ void setPalette(Palette &pal, QColor c) void Static::_init() { - hicolour_ = QPixmap::defaultDepth() > 8; + hicolour_ = TQPixmap::defaultDepth() > 8; animationStyle_ = 0; updatePixmaps(); } @@ -242,13 +242,13 @@ void Static::updatePixmaps() _drawButtonBackgrounds(); } -void Static::_createTexture(QPixmap &px, int t, bool active) +void Static::_createTexture(TQPixmap &px, int t, bool active) { - const QImage texture(QPixmap((const char **)texture_xpm).convertToImage()); + const TQImage texture(TQPixmap((const char **)texture_xpm).convertToImage()); const QRgb w(qRgb(255, 255, 255)); const QRgb b(qRgb(0, 0, 0)); - QColor c(KDecoration::options()->color(KDecoration::ColorType(t), active)); + TQColor c(KDecoration::options()->color(KDecoration::ColorType(t), active)); QRgb mid (c.rgb()); QRgb light (c.light(110).rgb()); @@ -267,7 +267,7 @@ void Static::_createTexture(QPixmap &px, int t, bool active) px.convertFromImage(texture); } -const QPixmap& Static::buttonBase(bool active, bool down) const +const TQPixmap& Static::buttonBase(bool active, bool down) const { if (active) return down ? aButtonDown_ : aButtonUp_; @@ -277,9 +277,9 @@ const QPixmap& Static::buttonBase(bool active, bool down) const void Static::_initSizes() { - QFont f(KDecoration::options()->font(true)); // XXX false doesn't work right at the moment + TQFont f(KDecoration::options()->font(true)); // XXX false doesn't work right at the moment - QFontMetrics fm(f); + TQFontMetrics fm(f); int h = fm.height(); @@ -361,7 +361,7 @@ void Static::_initTextures() void Static::_drawTitleTextAreaSides() { - QPixmap temp(4, titleHeight_); + TQPixmap temp(4, titleHeight_); temp.fill(Qt::black); transx = transy = 0.0; @@ -393,7 +393,7 @@ void Static::_drawTitleTextAreaSides() void Static::_drawResizeCentralAreaSides() { - QPixmap temp(4, resizeHeight_); + TQPixmap temp(4, resizeHeight_); temp.fill(Qt::black); transy = 1.0; @@ -424,7 +424,7 @@ void Static::_drawResizeCentralAreaSides() void Static::_drawTitleTextAreaBackground() { - QPixmap temp(70, titleHeight_); + TQPixmap temp(70, titleHeight_); temp.fill(Qt::black); transx = transy = 0.0; @@ -450,7 +450,7 @@ void Static::_drawTitleTextAreaBackground() void Static::_drawResizeCentralAreaBackground() { - QPixmap temp(70, titleHeight_); + TQPixmap temp(70, titleHeight_); temp.fill(Qt::black); transy = 1.0; diff --git a/kwin-styles/riscos/Static.h b/kwin-styles/riscos/Static.h index 8a01d03b..e7b49d59 100644 --- a/kwin-styles/riscos/Static.h +++ b/kwin-styles/riscos/Static.h @@ -23,10 +23,10 @@ #ifndef RISC_OS_STATIC_H #define RISC_OS_STATIC_H -#include <qimage.h> -#include <qpixmap.h> -#include <qpainter.h> -#include <qstringlist.h> +#include <tqimage.h> +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqstringlist.h> #include "Palette.h" @@ -54,14 +54,14 @@ class Static void reset(); void updatePixmaps(); - const QPixmap& titleTextLeft(bool active) const; - const QPixmap& titleTextRight(bool active) const; - const QPixmap& resizeMidLeft(bool active) const; - const QPixmap& resizeMidRight(bool active) const; - const QPixmap& titleTextMid(bool active) const; - const QPixmap& resizeMidMid(bool active) const; - const QPixmap& buttonBase(bool active, bool down) const; - const QPixmap& resize(bool active) const; + const TQPixmap& titleTextLeft(bool active) const; + const TQPixmap& titleTextRight(bool active) const; + const TQPixmap& resizeMidLeft(bool active) const; + const TQPixmap& resizeMidRight(bool active) const; + const TQPixmap& titleTextMid(bool active) const; + const TQPixmap& resizeMidMid(bool active) const; + const TQPixmap& buttonBase(bool active, bool down) const; + const TQPixmap& resize(bool active) const; int animationStyle() const; int titleHeight() const; @@ -71,8 +71,8 @@ class Static void _init(); - void _drawBorder(QPixmap&, int, int); - void _createTexture(QPixmap&, int, bool); + void _drawBorder(TQPixmap&, int, int); + void _createTexture(TQPixmap&, int, bool); void _initSizes(); @@ -111,9 +111,9 @@ class Static aResizeMidRight_, iResizeMidRight_, aResizeMid_, iResizeMid_; - QPixmap aTexture_, iTexture_, abTexture_, ibTexture_; + TQPixmap aTexture_, iTexture_, abTexture_, ibTexture_; - QPainter painter_; + TQPainter painter_; bool down_; Palette palette_; double transx, transy; diff --git a/kwin-styles/riscos/StickyButton.cpp b/kwin-styles/riscos/StickyButton.cpp index 808f04c7..b40db535 100644 --- a/kwin-styles/riscos/StickyButton.cpp +++ b/kwin-styles/riscos/StickyButton.cpp @@ -22,7 +22,7 @@ #include "StickyButton.h" -#include <qtooltip.h> +#include <tqtooltip.h> namespace RiscOS { @@ -66,24 +66,24 @@ static const char * const sticky_xpm[] = { ".. "}; -StickyButton::StickyButton(QWidget *parent) +StickyButton::StickyButton(TQWidget *parent) : Button(parent, i18n("On all desktops")), on_(false) { - setPixmap(QPixmap((const char **)sticky_xpm)); + setPixmap(TQPixmap((const char **)sticky_xpm)); } void StickyButton::setOn(bool on) { on_ = on; - setPixmap(on_ ? QPixmap((const char **)unsticky_xpm) : - QPixmap((const char **)sticky_xpm)); + setPixmap(on_ ? TQPixmap((const char **)unsticky_xpm) : + TQPixmap((const char **)sticky_xpm)); repaint(); - QToolTip::remove(this); - QToolTip::add(this, on_ ? i18n("Not on all desktops") + TQToolTip::remove(this); + TQToolTip::add(this, on_ ? i18n("Not on all desktops") : i18n("On all desktops")); } -void StickyButton::mouseReleaseEvent(QMouseEvent *e) +void StickyButton::mouseReleaseEvent(TQMouseEvent *e) { Button::mouseReleaseEvent(e); diff --git a/kwin-styles/riscos/StickyButton.h b/kwin-styles/riscos/StickyButton.h index fb7746ae..4c500b8b 100644 --- a/kwin-styles/riscos/StickyButton.h +++ b/kwin-styles/riscos/StickyButton.h @@ -34,7 +34,7 @@ class StickyButton : public Button public: - StickyButton(QWidget *parent); + StickyButton(TQWidget *parent); public slots: @@ -46,7 +46,7 @@ class StickyButton : public Button protected: - void mouseReleaseEvent(QMouseEvent *); + void mouseReleaseEvent(TQMouseEvent *); private: |