diff options
Diffstat (limited to 'twin/clients')
70 files changed, 322 insertions, 329 deletions
diff --git a/twin/clients/PORTING b/twin/clients/PORTING index 0c0c1a6ea..3db8af576 100644 --- a/twin/clients/PORTING +++ b/twin/clients/PORTING @@ -2,18 +2,14 @@ It's suggested you check sources of some KDE CVS decoration if in doubts or in n Also, the API is documented in the .h header files. Makefile.am: -- Change twin_ to twin3_ (in LDFLAGS, LIBADD, kde_module_LTLIBRARIES, SOURCES). - Make sure LDFLAGS contains $(KDE_PLUGIN) and -module . - Add -ltdecorations to LIBADD. - Do NOT rename the directory where the .desktop file is installed ( $(kde_datadir)/twin/ ). -.desktop file: -- Change twin_ to twin3_ in X-TDE-Library. - Sources: - There are no twin/something.h includes, and don't use the KWinInternal namespace. - Use QToolTip instead of KWinToolTip. -- Use QButton instead of KWinButton, QToolButton instead of KWinToolButton and QWidget +- Use QButton instead of KWinButton, QToolButton instead of KWinToolButton and TQWidget instead of KWinWidgetButton. - For tooltips, use simply QToolTip::add(). - Change Client* to MyClient* (or whatever is your main client class) in your MyButton. @@ -26,11 +22,11 @@ Sources: - As the first thing in init(), call createMainWidget(); if your client class took some flags such as WResizeNoErase, pass them to this function. - Then, do 'widget()->installEventFilter( this );'. -- Implement MyClient::eventFilter() - as MyClient is now no longer QWidget, you need the event +- Implement MyClient::eventFilter() - as MyClient is now no longer TQWidget, you need the event filter to call all the functions that used to be called directly. Usually, it's something like: ===== -bool MyClient::eventFilter( QObject* o, QEvent* e ) +bool MyClient::eventFilter( TQObject* o, QEvent* e ) { if ( o != widget() ) return false; @@ -67,7 +63,7 @@ bool MyClient::eventFilter( QObject* o, QEvent* e ) } ===== - In MyClient, 'this' will have to be often replaced with 'widget()', pay special attention - to cases where this won't cause compile error (e.g. in connect() calls, which take QObject* ). + to cases where this won't cause compile error (e.g. in connect() calls, which take TQObject* ). - Also, many calls may need 'widget()->' prepended. - Layout is created in init(), so call createLayout() directly there (if it's implemented). - Remove calls to Client methods (Client::resizeEvent() and so on). @@ -88,7 +84,7 @@ inline const KDecorationOptions* options() { return KDecoration::options(); } - Replace 'contextHelp()' with 'showContextHelp()'. - WindowWrapperShowEvent() is gone, simply use showEvent() filtered by the event filter if needed. - Change 'animateIconifyOrDeiconify()' to 'animateMinize()', if it's empty, simply remove it. - Make sure it doesn't reenter the event loop (no kapp->processEvents()). + Make sure it doesn't reenter the event loop (no tdeApp->processEvents()). - Buttons should use explicit setCursor() if they don't want cursor set by mousePosition(). I.e. usually call setCursor( ArrowCursor ) in your MyButton. - In the part where you insert windowWrapper() into the layout, i.e. something like diff --git a/twin/clients/b2/CMakeLists.txt b/twin/clients/b2/CMakeLists.txt index cd08f4d99..ba946ba75 100644 --- a/twin/clients/b2/CMakeLists.txt +++ b/twin/clients/b2/CMakeLists.txt @@ -32,9 +32,9 @@ tde_create_translated_desktop( ) -##### twin3_b2 (module) ######################### +##### twin_b2 (module) ######################### -tde_add_kpart( twin3_b2 AUTOMOC +tde_add_kpart( twin_b2 AUTOMOC SOURCES b2client.cpp LINK tdecorations-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/twin/clients/b2/Makefile.am b/twin/clients/b2/Makefile.am index ccd7f39fa..71bbbb556 100644 --- a/twin/clients/b2/Makefile.am +++ b/twin/clients/b2/Makefile.am @@ -3,12 +3,12 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes) SUBDIRS = . config -kde_module_LTLIBRARIES = twin3_b2.la +kde_module_LTLIBRARIES = twin_b2.la -twin3_b2_la_SOURCES = b2client.cpp -twin3_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_b2_la_SOURCES = b2client.cpp +twin_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module # twin_b2_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) -twin3_b2_la_LIBADD = ../../lib/libtdecorations.la +twin_b2_la_LIBADD = ../../lib/libtdecorations.la METASOURCES = AUTO noinst_HEADERS = b2client.h diff --git a/twin/clients/b2/b2.desktop b/twin/clients/b2/b2.desktop index b5eacefa9..767e9bfc4 100644 --- a/twin/clients/b2/b2.desktop +++ b/twin/clients/b2/b2.desktop @@ -1,3 +1,3 @@ [Desktop Entry] Name=B II -X-TDE-Library=twin3_b2 +X-TDE-Library=twin_b2 diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp index 3e0cdf7ad..571b16909 100644 --- a/twin/clients/b2/b2client.cpp +++ b/twin/clients/b2/b2client.cpp @@ -82,7 +82,7 @@ static bool drawSmallBorders = false; // ===================================== -extern "C" KDE_EXPORT KDecorationFactory* create_factory() +extern "C" TDE_EXPORT KDecorationFactory* create_factory() { return new B2::B2ClientFactory(); } @@ -221,7 +221,7 @@ static void create_pixmaps() TQPainter mask; mask.begin(&normalizeMask); - TQBrush one(Qt::color1); + TQBrush one(TQt::color1); mask.fillRect(normalizeMask.width() - 12, normalizeMask.height() - 12, 12, 12, one); mask.fillRect(0, 0, 10, 10, one); @@ -444,9 +444,9 @@ bool B2Client::isModalSystemNotification() result = XGetWindowProperty(tqt_xdisplay(), windowId(), kde_wm_system_modal_notification, 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left, /*(unsigned char **)*/ &data); if (result == Success && data != None && format == 32 ) { - return TRUE; + return true; } - return FALSE; + return false; } void B2Client::addButtons(const TQString& s, const TQString tips[], @@ -461,11 +461,11 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], if (!isModalSystemNotification()) { if (!button[BtnMenu]) { button[BtnMenu] = new B2Button(this, tb, tips[BtnMenu], - Qt::LeftButton | Qt::RightButton); + TQt::LeftButton | TQt::RightButton); button[BtnMenu]->setPixmaps(P_MENU); button[BtnMenu]->setUseMiniIcon(); - connect(button[BtnMenu], TQT_SIGNAL(pressed()), - this, TQT_SLOT(menuButtonPressed())); + connect(button[BtnMenu], TQ_SIGNAL(pressed()), + this, TQ_SLOT(menuButtonPressed())); titleLayout->addWidget(button[BtnMenu]); } } @@ -477,8 +477,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], button[BtnSticky]->setPixmaps(P_PINUP); button[BtnSticky]->setToggle(); button[BtnSticky]->setDown(isOnAllDesktops()); - connect(button[BtnSticky], TQT_SIGNAL(clicked()), - this, TQT_SLOT(toggleOnAllDesktops())); + connect(button[BtnSticky], TQ_SIGNAL(clicked()), + this, TQ_SLOT(toggleOnAllDesktops())); titleLayout->addWidget(button[BtnSticky]); } } @@ -487,8 +487,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], if (providesContextHelp() && (!button[BtnHelp])) { button[BtnHelp] = new B2Button(this, tb, tips[BtnHelp]); button[BtnHelp]->setPixmaps(P_HELP); - connect(button[BtnHelp], TQT_SIGNAL(clicked()), - this, TQT_SLOT(showContextHelp())); + connect(button[BtnHelp], TQ_SIGNAL(clicked()), + this, TQ_SLOT(showContextHelp())); titleLayout->addWidget(button[BtnHelp]); } break; @@ -496,19 +496,19 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], if (isMinimizable() && (!button[BtnIconify])) { button[BtnIconify] = new B2Button(this, tb,tips[BtnIconify]); button[BtnIconify]->setPixmaps(P_ICONIFY); - connect(button[BtnIconify], TQT_SIGNAL(clicked()), - this, TQT_SLOT(minimize())); + connect(button[BtnIconify], TQ_SIGNAL(clicked()), + this, TQ_SLOT(minimize())); titleLayout->addWidget(button[BtnIconify]); } break; case 'A': // Maximize button if (isMaximizable() && (!button[BtnMax])) { button[BtnMax] = new B2Button(this, tb, tips[BtnMax], - Qt::LeftButton | Qt::MidButton | Qt::RightButton); + TQt::LeftButton | TQt::MidButton | TQt::RightButton); button[BtnMax]->setPixmaps(maximizeMode() == MaximizeFull ? P_NORMALIZE : P_MAX); - connect(button[BtnMax], TQT_SIGNAL(clicked()), - this, TQT_SLOT(maxButtonClicked())); + connect(button[BtnMax], TQ_SIGNAL(clicked()), + this, TQ_SLOT(maxButtonClicked())); titleLayout->addWidget(button[BtnMax]); } break; @@ -516,8 +516,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], if (isCloseable() && !button[BtnClose]) { button[BtnClose] = new B2Button(this, tb, tips[BtnClose]); button[BtnClose]->setPixmaps(P_CLOSE); - connect(button[BtnClose], TQT_SIGNAL(clicked()), - this, TQT_SLOT(closeWindow())); + connect(button[BtnClose], TQ_SIGNAL(clicked()), + this, TQ_SLOT(closeWindow())); titleLayout->addWidget(button[BtnClose]); } break; @@ -525,8 +525,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], if (isShadeable() && !button[BtnShade]) { button[BtnShade] = new B2Button(this, tb, tips[BtnShade]); button[BtnShade]->setPixmaps(P_SHADE); - connect(button[BtnShade], TQT_SIGNAL(clicked()), - this, TQT_SLOT(shadeButtonClicked())); + connect(button[BtnShade], TQ_SIGNAL(clicked()), + this, TQ_SLOT(shadeButtonClicked())); titleLayout->addWidget(button[BtnShade]); } break; @@ -534,8 +534,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], if (resizable && !button[BtnResize]) { button[BtnResize] = new B2Button(this, tb, tips[BtnResize]); button[BtnResize]->setPixmaps(P_RESIZE); - connect(button[BtnResize], TQT_SIGNAL(pressed()), - this, TQT_SLOT(resizeButtonPressed())); + connect(button[BtnResize], TQ_SIGNAL(pressed()), + this, TQ_SLOT(resizeButtonPressed())); titleLayout->addWidget(button[BtnResize]); } break; @@ -676,7 +676,7 @@ void B2Client::paintEvent(TQPaintEvent* e) // bottom handle rect if (mustDrawHandle()) { - p.setPen(Qt::black); + p.setPen(TQt::black); int hx = width() - 40; int hw = 40; @@ -981,8 +981,8 @@ static void redraw_pixmaps() KPixmap *pix = pixmap[P_SHADE * NumStates + i]; TQColor color = is_act ? aGrp.button() : iGrp.button(); drawB2Rect(&thinBox, color, is_down); - pix->fill(Qt::black); - bitBlt(TQT_TQPAINTDEVICE(pix), 0, 0, TQT_TQPAINTDEVICE(&thinBox), + pix->fill(TQt::black); + bitBlt(pix, 0, 0, &thinBox, 0, 0, thinBox.width(), thinBox.height(), TQt::CopyROP, true); } @@ -1005,12 +1005,12 @@ static void redraw_pixmaps() drawB2Rect(&smallBox, is_act ? aGrp.button() : iGrp.button(), is_down); drawB2Rect(&largeBox, is_act ? aGrp.button() : iGrp.button(), is_down); pix->fill(options()->color(KDecoration::ColorTitleBar, is_act)); - bitBlt(TQT_TQPAINTDEVICE(pix), pix->width() - 12, pix->width() - 12, TQT_TQPAINTDEVICE(&largeBox), + bitBlt(pix, pix->width() - 12, pix->width() - 12, &largeBox, 0, 0, 12, 12, TQt::CopyROP, true); - bitBlt(TQT_TQPAINTDEVICE(pix), 0, 0, TQT_TQPAINTDEVICE(&smallBox), 0, 0, 10, 10, TQt::CopyROP, true); + bitBlt(pix, 0, 0, &smallBox, 0, 0, 10, 10, TQt::CopyROP, true); - bitBlt(TQT_TQPAINTDEVICE(pixmap[P_ICONIFY * NumStates + i]), 0, 0, - TQT_TQPAINTDEVICE(&smallBox), 0, 0, 10, 10, TQt::CopyROP, true); + bitBlt(pixmap[P_ICONIFY * NumStates + i], 0, 0, + &smallBox, 0, 0, 10, 10, TQt::CopyROP, true); } // resize @@ -1020,8 +1020,8 @@ static void redraw_pixmaps() *pixmap[P_RESIZE * NumStates + i] = *pixmap[P_CLOSE * NumStates + i]; pixmap[P_RESIZE * NumStates + i]->detach(); drawB2Rect(&smallBox, is_act ? aGrp.button() : iGrp.button(), is_down); - bitBlt(TQT_TQPAINTDEVICE(pixmap[P_RESIZE * NumStates + i]), - 0, 0, TQT_TQPAINTDEVICE(&smallBox), 0, 0, 10, 10, TQt::CopyROP, true); + bitBlt(pixmap[P_RESIZE * NumStates + i], + 0, 0, &smallBox, 0, 0, 10, 10, TQt::CopyROP, true); } @@ -1166,7 +1166,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear) *visible_bound = geom; } TQPainter p(workspaceWidget()); - p.setPen(TQPen(Qt::white, 5)); + p.setPen(TQPen(TQt::white, 5)); p.setRasterOp(TQt::XorROP); p.drawPolygon(bound_shape); @@ -1179,26 +1179,26 @@ bool B2Client::drawbound(const TQRect& geom, bool clear) bool B2Client::eventFilter(TQObject *o, TQEvent *e) { - if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget())) + if (o != widget()) return false; switch (e->type()) { case TQEvent::Resize: - resizeEvent(TQT_TQRESIZEEVENT(e)); + resizeEvent(static_cast<TQResizeEvent*>(e)); return true; case TQEvent::Paint: - paintEvent(TQT_TQPAINTEVENT(e)); + paintEvent(static_cast<TQPaintEvent*>(e)); return true; case TQEvent::MouseButtonDblClick: - titlebar->mouseDoubleClickEvent(TQT_TQMOUSEEVENT(e)); + titlebar->mouseDoubleClickEvent(static_cast<TQMouseEvent*>(e)); return true; case TQEvent::Wheel: - titlebar->wheelEvent(TQT_TQWHEELEVENT(e)); + titlebar->wheelEvent(static_cast<TQWheelEvent*>(e)); return true; case TQEvent::MouseButtonPress: - processMousePressEvent(TQT_TQMOUSEEVENT(e)); + processMousePressEvent(static_cast<TQMouseEvent*>(e)); return true; case TQEvent::Show: - showEvent(TQT_TQSHOWEVENT(e)); + showEvent(static_cast<TQShowEvent*>(e)); return true; default: break; @@ -1213,7 +1213,7 @@ B2Button::B2Button(B2Client *_client, TQWidget *parent, : TQButton(parent, 0), hover(false) { setBackgroundMode(NoBackground); - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); realizeButtons = realizeBtns; client = _client; useMiniIcon = false; @@ -1280,7 +1280,7 @@ void B2Button::mousePressEvent(TQMouseEvent * e) { last_button = e->button(); TQMouseEvent me(e->type(), e->pos(), e->globalPos(), - (e->button() & realizeButtons) ? Qt::LeftButton : Qt::NoButton, + (e->button() & realizeButtons) ? TQt::LeftButton : TQt::NoButton, e->state()); TQButton::mousePressEvent(&me); } @@ -1289,7 +1289,7 @@ void B2Button::mouseReleaseEvent(TQMouseEvent * e) { last_button = e->button(); TQMouseEvent me(e->type(), e->pos(), e->globalPos(), - (e->button() & realizeButtons) ? Qt::LeftButton : Qt::NoButton, + (e->button() & realizeButtons) ? TQt::LeftButton : TQt::NoButton, e->state()); TQButton::mouseReleaseEvent(&me); } @@ -1356,7 +1356,7 @@ void B2Titlebar::drawTitlebar(TQPainter &p, bool state) TQRect t = rect(); // black titlebar frame - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawLine(0, 0, 0, t.bottom()); p.drawLine(0, 0, t.right(), 0); p.drawLine(t.right(), 0, t.right(), t.bottom()); @@ -1395,7 +1395,7 @@ void B2Titlebar::resizeEvent(TQResizeEvent *) void B2Titlebar::paintEvent(TQPaintEvent *) { if(client->isActive()) - bitBlt(TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&titleBuffer), 0, 0, titleBuffer.width(), + bitBlt(this, 0, 0, &titleBuffer, 0, 0, titleBuffer.width(), titleBuffer.height(), TQt::CopyROP, true); else { TQPainter p(this); @@ -1405,14 +1405,14 @@ void B2Titlebar::paintEvent(TQPaintEvent *) void B2Titlebar::mouseDoubleClickEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton && e->y() < height()) { + if (e->button() == TQt::LeftButton && e->y() < height()) { client->titlebarDblClickOperation(); } } void B2Titlebar::wheelEvent(TQWheelEvent *e) { - if (client->isSetShade() || TQT_TQRECT_OBJECT(rect()).contains(e->pos())) + if (client->isSetShade() || rect().contains(e->pos())) client->titlebarMouseWheelOperation( e->delta()); } diff --git a/twin/clients/b2/b2client.h b/twin/clients/b2/b2client.h index 30220b175..c9748ccd6 100644 --- a/twin/clients/b2/b2client.h +++ b/twin/clients/b2/b2client.h @@ -28,7 +28,7 @@ class B2Client; class B2Button : public TQButton { public: - B2Button(B2Client *_client=0, TQWidget *parent=0, const TQString& tip=NULL, const int realizeBtns = Qt::LeftButton); + B2Button(B2Client *_client=0, TQWidget *parent=0, const TQString& tip=NULL, const int realizeBtns = TQt::LeftButton); ~B2Button() {}; void setBg(const TQColor &c){bg = c;} @@ -93,7 +93,7 @@ private: class B2Client : public KDecoration { - Q_OBJECT + TQ_OBJECT friend class B2Titlebar; public: B2Client(KDecorationBridge *b, KDecorationFactory *f); diff --git a/twin/clients/b2/config/config.cpp b/twin/clients/b2/config/config.cpp index 5b7a29e0f..70942bce1 100644 --- a/twin/clients/b2/config/config.cpp +++ b/twin/clients/b2/config/config.cpp @@ -15,7 +15,7 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) + TDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) { return(new B2Config(conf, parent)); } @@ -70,12 +70,12 @@ B2Config::B2Config( TDEConfig* conf, TQWidget* parent ) load(conf); // Ensure we track user changes properly - connect(cbColorBorder, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelectionChanged())); - connect(showGrabHandleCb, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelectionChanged())); - connect(menuDblClickOp, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotSelectionChanged())); + connect(cbColorBorder, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelectionChanged())); + connect(showGrabHandleCb, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelectionChanged())); + connect(menuDblClickOp, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSelectionChanged())); // Make the widgets visible in twindecoration gb->show(); } diff --git a/twin/clients/b2/config/config.h b/twin/clients/b2/config/config.h index a5382dc45..0a3e7c9ec 100644 --- a/twin/clients/b2/config/config.h +++ b/twin/clients/b2/config/config.h @@ -18,7 +18,7 @@ class B2Config: public TQObject { - Q_OBJECT + TQ_OBJECT public: B2Config( TDEConfig* conf, TQWidget* parent ); diff --git a/twin/clients/default/CMakeLists.txt b/twin/clients/default/CMakeLists.txt index 142a9b783..56bae72f9 100644 --- a/twin/clients/default/CMakeLists.txt +++ b/twin/clients/default/CMakeLists.txt @@ -23,9 +23,9 @@ link_directories( ) -##### twin3_default (module) #################### +##### twin_default (module) #################### -tde_add_kpart( twin3_default AUTOMOC +tde_add_kpart( twin_default AUTOMOC SOURCES kdedefault.cpp LINK tdecorations-shared tdecore-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/twin/clients/default/Makefile.am b/twin/clients/default/Makefile.am index 3e687a2a6..2b609988b 100644 --- a/twin/clients/default/Makefile.am +++ b/twin/clients/default/Makefile.am @@ -3,11 +3,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes) SUBDIRS = . config -kde_module_LTLIBRARIES = twin3_default.la +kde_module_LTLIBRARIES = twin_default.la -twin3_default_la_SOURCES = kdedefault.cpp -twin3_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -twin3_default_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.la +twin_default_la_SOURCES = kdedefault.cpp +twin_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_default_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.la METASOURCES = AUTO noinst_HEADERS = kdedefault.h diff --git a/twin/clients/default/config/config.cpp b/twin/clients/default/config/config.cpp index 886077925..054279fc0 100644 --- a/twin/clients/default/config/config.cpp +++ b/twin/clients/default/config/config.cpp @@ -17,7 +17,7 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) + TDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) { return(new KDEDefaultConfig(conf, parent)); } @@ -61,13 +61,13 @@ KDEDefaultConfig::KDEDefaultConfig( TDEConfig* conf, TQWidget* parent ) load( conf ); // Ensure we track user changes properly - connect( cbShowStipple, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelectionChanged()) ); - connect( cbShowGrabBar, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelectionChanged()) ); + connect( cbShowStipple, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelectionChanged()) ); + connect( cbShowGrabBar, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelectionChanged()) ); if (highcolor) - connect( cbUseGradients, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelectionChanged()) ); + connect( cbUseGradients, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelectionChanged()) ); // Make the widgets visible in twindecoration gb->show(); diff --git a/twin/clients/default/config/config.h b/twin/clients/default/config/config.h index daf38af95..d01459a13 100644 --- a/twin/clients/default/config/config.h +++ b/twin/clients/default/config/config.h @@ -19,7 +19,7 @@ class KDEDefaultConfig: public TQObject { - Q_OBJECT + TQ_OBJECT public: KDEDefaultConfig( TDEConfig* conf, TQWidget* parent ); diff --git a/twin/clients/default/kdedefault.cpp b/twin/clients/default/kdedefault.cpp index e6d742bd6..33eb46f4d 100644 --- a/twin/clients/default/kdedefault.cpp +++ b/twin/clients/default/kdedefault.cpp @@ -267,11 +267,11 @@ void KDEDefaultHandler::createPixmaps() int i, x, y; titlePix = new TQPixmap(132, normalTitleHeight+2); TQBitmap mask(132, normalTitleHeight+2); - mask.fill(Qt::color0); + mask.fill(TQt::color0); p.begin(titlePix); maskPainter.begin(&mask); - maskPainter.setPen(Qt::color1); + maskPainter.setPen(TQt::color1); for(i=0, y=2; i < 9; ++i, y+=4) for(x=1; x <= 132; x+=3) { @@ -681,9 +681,9 @@ void KDEDefaultButton::drawButton(TQPainter *p) active).rgb() ) > 127; if (isMouseOver) - p->setPen( darkDeco ? Qt::darkGray : Qt::lightGray ); + p->setPen( darkDeco ? TQt::darkGray : TQt::lightGray ); else - p->setPen( darkDeco ? Qt::black : Qt::white ); + p->setPen( darkDeco ? TQt::black : TQt::white ); int xOff = (width()-10)/2; int yOff = (height()-10)/2; @@ -905,7 +905,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* ) titleBuffer->resize( rightOffset-3, titleHeight+1 ); // Draw an outer black frame - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawRect(x,y,w,h); // Draw part of the frame that is the titlebar color @@ -923,7 +923,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* ) options()->color(ColorTitleBar, isActive() )); // Finish drawing the titlebar extension - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawLine(x+1, leftFrameStart+borderWidth-4, x+borderWidth-2, leftFrameStart-1); p.setPen(g.mid()); p.drawLine(x+borderWidth-2, y+titleHeight+3, x+borderWidth-2, leftFrameStart-2); @@ -939,7 +939,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* ) p.setPen(options()->color(ColorFrame, isActive())); TQPointArray a; - TQBrush brush( options()->color(ColorFrame, isActive()), Qt::SolidPattern ); + TQBrush brush( options()->color(ColorFrame, isActive()), TQt::SolidPattern ); p.setBrush( brush ); // use solid, yellow brush a.setPoints( 4, x+2, leftFrameStart+borderWidth-4, x+borderWidth-2, leftFrameStart, @@ -1060,7 +1060,7 @@ TQRegion KDEDefaultClient::cornerShape(WindowCorner corner) } // namespace // Extended KWin plugin interface -extern "C" KDE_EXPORT KDecorationFactory* create_factory() +extern "C" TDE_EXPORT KDecorationFactory* create_factory() { return new Default::KDEDefaultHandler(); } diff --git a/twin/clients/keramik/CMakeLists.txt b/twin/clients/keramik/CMakeLists.txt index 6eade7074..736d3dc3a 100644 --- a/twin/clients/keramik/CMakeLists.txt +++ b/twin/clients/keramik/CMakeLists.txt @@ -32,12 +32,12 @@ tde_create_translated_desktop( ) -##### twin3_keramik (module) #################### +##### twin_keramik (module) #################### set_source_files_properties( keramik.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tiles.h ) -tde_add_kpart( twin3_keramik AUTOMOC +tde_add_kpart( twin_keramik AUTOMOC SOURCES keramik.cpp LINK tdecorations-shared tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/twin/clients/keramik/Makefile.am b/twin/clients/keramik/Makefile.am index 2ed77cac7..3fe2162ed 100644 --- a/twin/clients/keramik/Makefile.am +++ b/twin/clients/keramik/Makefile.am @@ -10,13 +10,13 @@ embedtool_SOURCES = embedtool.cpp embedtool_LDADD = $(LIB_TQT) embedtool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -kde_module_LTLIBRARIES = twin3_keramik.la +kde_module_LTLIBRARIES = twin_keramik.la -twin3_keramik_la_SOURCES = keramik.cpp -twin3_keramik_la_COMPILE_FIRST = tiles.h -twin3_keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -twin3_keramik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la -#twin3_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) +twin_keramik_la_SOURCES = keramik.cpp +twin_keramik_la_COMPILE_FIRST = tiles.h +twin_keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_keramik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la +#twin_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) METASOURCES = AUTO noinst_headers = keramik.h tiles.h diff --git a/twin/clients/keramik/config/config.cpp b/twin/clients/keramik/config/config.cpp index dfd5e20aa..408c5a38a 100644 --- a/twin/clients/keramik/config/config.cpp +++ b/twin/clients/keramik/config/config.cpp @@ -33,7 +33,7 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) + TDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) { return ( new KeramikConfig( conf, parent ) ); } @@ -55,10 +55,10 @@ KeramikConfig::KeramikConfig( TDEConfig* conf, TQWidget* parent ) c = new TDEConfig( "twinkeramikrc" ); ui = new KeramikConfigUI( parent ); - connect( ui->showAppIcons, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) ); - connect( ui->smallCaptions, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) ); - connect( ui->largeGrabBars, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) ); - connect( ui->useShadowedText, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) ); + connect( ui->showAppIcons, TQ_SIGNAL(clicked()), TQ_SIGNAL(changed()) ); + connect( ui->smallCaptions, TQ_SIGNAL(clicked()), TQ_SIGNAL(changed()) ); + connect( ui->largeGrabBars, TQ_SIGNAL(clicked()), TQ_SIGNAL(changed()) ); + connect( ui->useShadowedText, TQ_SIGNAL(clicked()), TQ_SIGNAL(changed()) ); load( conf ); ui->show(); diff --git a/twin/clients/keramik/config/config.h b/twin/clients/keramik/config/config.h index 721248a09..42f3a44e2 100644 --- a/twin/clients/keramik/config/config.h +++ b/twin/clients/keramik/config/config.h @@ -31,7 +31,7 @@ class KeramikConfig: public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/twin/clients/keramik/embedtool.cpp b/twin/clients/keramik/embedtool.cpp index 88cf93838..1cc56fe32 100644 --- a/twin/clients/keramik/embedtool.cpp +++ b/twin/clients/keramik/embedtool.cpp @@ -66,7 +66,7 @@ KeramikEmbedder::KeramikEmbedder() file = new TQFile( "tiles.h" ); file->open( IO_WriteOnly | IO_Truncate ); - stream.setDevice( TQT_TQIODEVICE(file) ); + stream.setDevice( file ); stream << "/*\n"; stream << " * Generated by embedtool 1.0 on " << datestring << endl; @@ -101,7 +101,7 @@ void KeramikEmbedder::embed( const char *name ) codename = codename.replace( TQRegExp("[^a-zA-Z0-9]"), "_" ); - stream << "\tstatic const QRgb " << codename << "_data[] = {" << endl << "\t\t"; + stream << "\tstatic const TQRgb " << codename << "_data[] = {" << endl << "\t\t"; stream.setf( TQTextStream::hex | TQTextStream::right ); stream.fill( '0' ); @@ -147,7 +147,7 @@ void KeramikEmbedder::writeIndex() stream << "\t\tint width;\n"; stream << "\t\tint height;\n"; stream << "\t\tbool alpha;\n"; - stream << "\t\tconst QRgb *data;\n"; + stream << "\t\tconst TQRgb *data;\n"; stream << "\t};\n\n"; uint i = 0; diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp index 82a6aba83..d5c441a26 100644 --- a/twin/clients/keramik/keramik.cpp +++ b/twin/clients/keramik/keramik.cpp @@ -411,18 +411,18 @@ void KeramikHandler::createPixmaps() } // Pretile the center & border tiles for optimal performance - pretile( activeTiles[ CaptionSmallCenter ], 64, Qt::Horizontal ); - pretile( activeTiles[ CaptionLargeCenter ], 64, Qt::Horizontal ); - pretile( activeTiles[ TitleCenter ], 64, Qt::Horizontal ); - pretile( activeTiles[ GrabBarCenter ], 128, Qt::Horizontal ); - pretile( activeTiles[ BorderLeft ], 128, Qt::Vertical ); - pretile( activeTiles[ BorderRight ], 128, Qt::Vertical ); - - pretile( inactiveTiles[ CaptionSmallCenter ], 64, Qt::Horizontal ); - pretile( inactiveTiles[ TitleCenter ], 64, Qt::Horizontal ); - pretile( inactiveTiles[ GrabBarCenter ], 128, Qt::Horizontal ); - pretile( inactiveTiles[ BorderLeft ], 128, Qt::Vertical ); - pretile( inactiveTiles[ BorderRight ], 128, Qt::Vertical ); + pretile( activeTiles[ CaptionSmallCenter ], 64, TQt::Horizontal ); + pretile( activeTiles[ CaptionLargeCenter ], 64, TQt::Horizontal ); + pretile( activeTiles[ TitleCenter ], 64, TQt::Horizontal ); + pretile( activeTiles[ GrabBarCenter ], 128, TQt::Horizontal ); + pretile( activeTiles[ BorderLeft ], 128, TQt::Vertical ); + pretile( activeTiles[ BorderRight ], 128, TQt::Vertical ); + + pretile( inactiveTiles[ CaptionSmallCenter ], 64, TQt::Horizontal ); + pretile( inactiveTiles[ TitleCenter ], 64, TQt::Horizontal ); + pretile( inactiveTiles[ GrabBarCenter ], 128, TQt::Horizontal ); + pretile( inactiveTiles[ BorderLeft ], 128, TQt::Vertical ); + pretile( inactiveTiles[ BorderRight ], 128, TQt::Vertical ); if (heightOffset > 0) { addHeight (heightOffset, activeTiles[TitleLeft]); @@ -541,12 +541,12 @@ void KeramikHandler::flip( TQPixmap *&pix1, TQPixmap *&pix2 ) } -void KeramikHandler::pretile( TQPixmap *&pix, int size, Qt::Orientation dir ) +void KeramikHandler::pretile( TQPixmap *&pix, int size, TQt::Orientation dir ) { TQPixmap *newpix; TQPainter p; - if ( dir == Qt::Horizontal ) + if ( dir == TQt::Horizontal ) newpix = new TQPixmap( size, pix->height() ); else newpix = new TQPixmap( pix->width(), size ); @@ -759,13 +759,13 @@ TQValueList< KeramikHandler::BorderSize > KeramikHandler::borderSizes() const KeramikButton::KeramikButton( KeramikClient* c, const char *name, Button btn, const TQString &tip, const int realizeBtns ) : TQButton( c->widget(), name ), - client( c ), button( btn ), hover( false ), lastbutton( Qt::NoButton ) + client( c ), button( btn ), hover( false ), lastbutton( TQt::NoButton ) { realizeButtons = realizeBtns; TQToolTip::add( this, tip ); // FRAME setBackgroundMode( NoBackground ); - setCursor( tqarrowCursor ); + setCursor( TQt::arrowCursor ); int size = clientHandler->roundButton()->height(); setFixedSize( size, size ); @@ -800,7 +800,7 @@ void KeramikButton::leaveEvent( TQEvent *e ) void KeramikButton::mousePressEvent( TQMouseEvent *e ) { lastbutton = e->button(); - TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() ); + TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?TQt::LeftButton:TQt::NoButton, e->state() ); TQButton::mousePressEvent( &me ); } @@ -808,7 +808,7 @@ void KeramikButton::mousePressEvent( TQMouseEvent *e ) void KeramikButton::mouseReleaseEvent( TQMouseEvent *e ) { lastbutton = e->button(); - TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() ); + TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?TQt::LeftButton:TQt::NoButton, e->state() ); TQButton::mouseReleaseEvent( &me ); } @@ -889,7 +889,7 @@ void KeramikButton::drawButton( TQPainter *p ) deco = NULL; } - p->setPen( Qt::black ); // ### hardcoded color + p->setPen( TQt::black ); // ### hardcoded color p->drawPixmap( (size-17)/2, (size-17)/2, *deco ); } @@ -907,8 +907,8 @@ KeramikClient::KeramikClient( KDecorationBridge* bridge, KDecorationFactory* fac void KeramikClient::init() { - connect( this, TQT_SIGNAL( keepAboveChanged( bool )), TQT_SLOT( keepAboveChange( bool ))); - connect( this, TQT_SIGNAL( keepBelowChanged( bool )), TQT_SLOT( keepBelowChange( bool ))); + connect( this, TQ_SIGNAL( keepAboveChanged( bool )), TQ_SLOT( keepAboveChange( bool ))); + connect( this, TQ_SIGNAL( keepBelowChanged( bool )), TQ_SLOT( keepBelowChange( bool ))); createMainWidget( (WFlags)(WStaticContents | WResizeNoErase | WRepaintNoErase) ); widget()->installEventFilter( this ); @@ -1035,9 +1035,9 @@ bool KeramikClient::isModalSystemNotification() result = XGetWindowProperty(tqt_xdisplay(), windowId(), kde_wm_system_modal_notification, 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left, /*(unsigned char **)*/ &data); if (result == Success && data != None && format == 32 ) { - return TRUE; + return true; } - return FALSE; + return false; } void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) @@ -1050,8 +1050,8 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) case 'M' : if (!isModalSystemNotification()) { if ( !button[MenuButton] ) { - button[MenuButton] = new KeramikButton( this, "menu", MenuButton, i18n("Menu"), Qt::LeftButton|Qt::RightButton ); - connect( button[MenuButton], TQT_SIGNAL( pressed() ), TQT_SLOT( menuButtonPressed() ) ); + button[MenuButton] = new KeramikButton( this, "menu", MenuButton, i18n("Menu"), TQt::LeftButton|TQt::RightButton ); + connect( button[MenuButton], TQ_SIGNAL( pressed() ), TQ_SLOT( menuButtonPressed() ) ); layout->addWidget( button[MenuButton] ); } } @@ -1065,7 +1065,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) OnAllDesktopsButton, isOnAllDesktops()?i18n("Not on all desktops"):i18n("On all desktops") ); if(isOnAllDesktops()) button[OnAllDesktopsButton]->toggle(); - connect( button[OnAllDesktopsButton], TQT_SIGNAL( clicked() ), TQT_SLOT( toggleOnAllDesktops() ) ); + connect( button[OnAllDesktopsButton], TQ_SIGNAL( clicked() ), TQ_SLOT( toggleOnAllDesktops() ) ); layout->addWidget( button[OnAllDesktopsButton] ); } } @@ -1075,7 +1075,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) case 'H' : if ( !button[HelpButton] && providesContextHelp() ) { button[HelpButton] = new KeramikButton( this, "help", HelpButton, i18n("Help") ); - connect( button[HelpButton], TQT_SIGNAL( clicked() ), TQT_SLOT( showContextHelp() ) ); + connect( button[HelpButton], TQ_SIGNAL( clicked() ), TQ_SLOT( showContextHelp() ) ); layout->addWidget( button[HelpButton] ); } break; @@ -1084,7 +1084,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) case 'I' : if ( !button[MinButton] && isMinimizable() ) { button[MinButton] = new KeramikButton( this, "minimize", MinButton, i18n("Minimize") ); - connect( button[MinButton], TQT_SIGNAL( clicked() ), TQT_SLOT( minimize() ) ); + connect( button[MinButton], TQ_SIGNAL( clicked() ), TQ_SLOT( minimize() ) ); layout->addWidget( button[MinButton] ); } break; @@ -1092,8 +1092,8 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) // Maximize button case 'A' : if ( !button[MaxButton] && isMaximizable() ) { - button[MaxButton] = new KeramikButton( this, "maximize", MaxButton, i18n("Maximize"), Qt::LeftButton|Qt::MidButton|Qt::RightButton ); - connect( button[MaxButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotMaximize() ) ); + button[MaxButton] = new KeramikButton( this, "maximize", MaxButton, i18n("Maximize"), TQt::LeftButton|TQt::MidButton|TQt::RightButton ); + connect( button[MaxButton], TQ_SIGNAL( clicked() ), TQ_SLOT( slotMaximize() ) ); layout->addWidget( button[MaxButton] ); } break; @@ -1102,7 +1102,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) case 'X' : if ( !button[CloseButton] && isCloseable() ) { button[CloseButton] = new KeramikButton( this, "close", CloseButton, i18n("Close") ); - connect( button[CloseButton], TQT_SIGNAL( clicked() ), TQT_SLOT( closeWindow() ) ); + connect( button[CloseButton], TQ_SIGNAL( clicked() ), TQ_SLOT( closeWindow() ) ); layout->addWidget( button[CloseButton] ); } break; @@ -1111,7 +1111,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) case 'F' : if ( !button[AboveButton]) { button[AboveButton] = new KeramikButton( this, "above", AboveButton, i18n("Keep Above Others") ); - connect( button[AboveButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotAbove() ) ); + connect( button[AboveButton], TQ_SIGNAL( clicked() ), TQ_SLOT( slotAbove() ) ); layout->addWidget( button[AboveButton] ); } break; @@ -1120,7 +1120,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) case 'B' : if ( !button[BelowButton]) { button[BelowButton] = new KeramikButton( this, "below", BelowButton, i18n("Keep Below Others") ); - connect( button[BelowButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotBelow() ) ); + connect( button[BelowButton], TQ_SIGNAL( clicked() ), TQ_SLOT( slotBelow() ) ); layout->addWidget( button[BelowButton] ); } break; @@ -1130,7 +1130,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) if ( !button[ShadeButton] && isShadeable() ) { button[ShadeButton] = new KeramikButton( this, "shade", ShadeButton, isSetShade() ? i18n("Unshade") : i18n( "Shade" )); - connect( button[ShadeButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotShade() ) ); + connect( button[ShadeButton], TQ_SIGNAL( clicked() ), TQ_SLOT( slotShade() ) ); layout->addWidget( button[ShadeButton] ); } break; @@ -1277,7 +1277,7 @@ void KeramikClient::updateCaptionBuffer() TQRect tr = TQStyle::visualRect( TQRect(xpos, 1, captionRect.width() - xpos - 10, captionRect.height() - 4), captionBuffer.rect() ); - //p.setPen( Qt::red ); // debug + //p.setPen( TQt::red ); // debug //p.drawRect( tr ); // debug // Application icon @@ -1647,10 +1647,10 @@ void KeramikClient::resizeEvent( TQResizeEvent *e ) int dy = 0; if ( e->oldSize().width() != width() ) - dx = 32 + QABS( e->oldSize().width() - width() ); + dx = 32 + TQABS( e->oldSize().width() - width() ); if ( e->oldSize().height() != height() ) - dy = 8 + QABS( e->oldSize().height() - height() ); + dy = 8 + TQABS( e->oldSize().height() - height() ); if ( dy ) widget()->update( 0, height() - dy + 1, width(), dy ); @@ -1662,7 +1662,7 @@ void KeramikClient::resizeEvent( TQResizeEvent *e ) widget()->update( TQRect( titlebar->geometry().topRight(), TQPoint( width() - 4, titlebar->geometry().bottom() ) ) ); // Titlebar needs no paint event - TQApplication::postEvent( this, new TQPaintEvent( titlebar->geometry(), FALSE ) ); + TQApplication::postEvent( this, new TQPaintEvent( titlebar->geometry(), false ) ); } } } @@ -1670,7 +1670,7 @@ void KeramikClient::resizeEvent( TQResizeEvent *e ) void KeramikClient::mouseDoubleClickEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::LeftButton + if ( e->button() == TQt::LeftButton && TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).contains( e->pos() ) ) titlebarDblClickOperation(); } @@ -1796,29 +1796,29 @@ TQSize KeramikClient::minimumSize() const bool KeramikClient::eventFilter( TQObject* o, TQEvent* e ) { - if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget()) ) + if ( o != widget() ) return false; switch ( e->type() ) { case TQEvent::Resize: - resizeEvent( TQT_TQRESIZEEVENT( e ) ); + resizeEvent( static_cast<TQResizeEvent*>( e ) ); return true; case TQEvent::Paint: - paintEvent( TQT_TQPAINTEVENT( e ) ); + paintEvent( static_cast<TQPaintEvent*>( e ) ); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent( TQT_TQMOUSEEVENT( e ) ); + mouseDoubleClickEvent( static_cast<TQMouseEvent*>( e ) ); return true; case TQEvent::MouseButtonPress: - processMousePressEvent( TQT_TQMOUSEEVENT( e ) ); + processMousePressEvent( static_cast<TQMouseEvent*>( e ) ); return true; case TQEvent::Wheel: - wheelEvent( TQT_TQWHEELEVENT( e )); + wheelEvent( static_cast<TQWheelEvent*>( e )); return true; default: @@ -1836,7 +1836,7 @@ bool KeramikClient::eventFilter( TQObject* o, TQEvent* e ) extern "C" { - KDE_EXPORT KDecorationFactory *create_factory() + TDE_EXPORT KDecorationFactory *create_factory() { Keramik::clientHandler = new Keramik::KeramikHandler(); return Keramik::clientHandler; diff --git a/twin/clients/keramik/keramik.desktop b/twin/clients/keramik/keramik.desktop index fa51c6ea1..fde07b804 100644 --- a/twin/clients/keramik/keramik.desktop +++ b/twin/clients/keramik/keramik.desktop @@ -1,3 +1,3 @@ [Desktop Entry] Name=Keramik -X-TDE-Library=twin3_keramik +X-TDE-Library=twin_keramik diff --git a/twin/clients/keramik/keramik.h b/twin/clients/keramik/keramik.h index 54639dece..7369b5346 100644 --- a/twin/clients/keramik/keramik.h +++ b/twin/clients/keramik/keramik.h @@ -92,7 +92,7 @@ namespace Keramik { void addWidth (int width, TQPixmap *&pix, bool left, TQPixmap *bottomPix); void addHeight (int height, TQPixmap *&pix); void flip( TQPixmap *&, TQPixmap *& ); - void pretile( TQPixmap *&, int, Qt::Orientation ); + void pretile( TQPixmap *&, int, TQt::Orientation ); TQPixmap *composite( TQImage *, TQImage * ); TQImage *loadImage( const TQString &, const TQColor & ); TQPixmap *loadPixmap( const TQString &, const TQColor & ); @@ -114,7 +114,7 @@ namespace Keramik { class KeramikButton : public TQButton { public: - KeramikButton( KeramikClient *, const char *, Button, const TQString &, const int realizeBtns = Qt::LeftButton ); + KeramikButton( KeramikClient *, const char *, Button, const TQString &, const int realizeBtns = TQt::LeftButton ); ~KeramikButton(); ButtonState lastButton() const { return lastbutton; } @@ -137,7 +137,7 @@ namespace Keramik { class KeramikClient : public KDecoration { - Q_OBJECT + TQ_OBJECT public: diff --git a/twin/clients/kwmtheme/Makefile.am b/twin/clients/kwmtheme/Makefile.am index e9d3c36b8..6a201bccf 100644 --- a/twin/clients/kwmtheme/Makefile.am +++ b/twin/clients/kwmtheme/Makefile.am @@ -1,11 +1,11 @@ SUBDIRS=cli_installer INCLUDES = $(all_includes) -kde_module_LTLIBRARIES = twin3_kwmtheme.la +kde_module_LTLIBRARIES = twin_kwmtheme.la -twin3_kwmtheme_la_SOURCES = kwmthemeclient.cpp -twin3_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -twin3_kwmtheme_la_LIBADD = -ltdecorations +twin_kwmtheme_la_SOURCES = kwmthemeclient.cpp +twin_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_kwmtheme_la_LIBADD = -ltdecorations METASOURCES = AUTO noinst_HEADERS = kwmthemeclient.h diff --git a/twin/clients/kwmtheme/cli_installer/main.cpp b/twin/clients/kwmtheme/cli_installer/main.cpp index 27af172e1..3f0e209ec 100644 --- a/twin/clients/kwmtheme/cli_installer/main.cpp +++ b/twin/clients/kwmtheme/cli_installer/main.cpp @@ -1,10 +1,10 @@ #include <tqfile.h> #include <tqdir.h> #include <tdeapplication.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeglobal.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdecmdlineargs.h> #include <tdelocale.h> @@ -67,7 +67,7 @@ int main(int argc, char **argv) TQDir().mkdir(localDirStr); TQFileInfo fi(f); - KSimpleConfig input(fi.absFilePath()); + TDESimpleConfig input(fi.absFilePath()); srcStr = fi.dirPath(true) + "/"; TDEConfig *output = TDEGlobal::config(); input.setGroup("Window Border"); diff --git a/twin/clients/kwmtheme/kwmtheme.desktop b/twin/clients/kwmtheme/kwmtheme.desktop index 69e066f63..b18ce962b 100644 --- a/twin/clients/kwmtheme/kwmtheme.desktop +++ b/twin/clients/kwmtheme/kwmtheme.desktop @@ -1,3 +1,3 @@ [Desktop Entry] Name=KWM Theme -X-TDE-Library=twin3_kwmtheme +X-TDE-Library=twin_kwmtheme diff --git a/twin/clients/kwmtheme/kwmthemeclient.cpp b/twin/clients/kwmtheme/kwmthemeclient.cpp index 73c8feaca..b0473261b 100644 --- a/twin/clients/kwmtheme/kwmthemeclient.cpp +++ b/twin/clients/kwmtheme/kwmthemeclient.cpp @@ -5,7 +5,7 @@ #include <tqdrawutil.h> #include <tqpainter.h> #include <kpixmapeffect.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdelocale.h> #include <tqbitmap.h> @@ -141,11 +141,11 @@ static void create_pixmaps() tmpStr = config->readEntry("TitleAlignment"); if(tmpStr == "right") - titleAlign = Qt::AlignRight | Qt::AlignVCenter; + titleAlign = TQt::AlignRight | TQt::AlignVCenter; else if(tmpStr == "middle") - titleAlign = Qt::AlignCenter; + titleAlign = TQt::AlignCenter; else - titleAlign = Qt::AlignLeft | Qt::AlignVCenter; + titleAlign = TQt::AlignLeft | TQt::AlignVCenter; titleSunken = config->readBoolEntry("TitleFrameShaded", true); // titleSunken = true; // is this fixed? titleTransparent = config->readBoolEntry("PixmapUnderTitleText", true); @@ -293,8 +293,8 @@ void KWMThemeClient::init() iconChange(); hb->addWidget(mnuBtn); mnuBtn->setFixedSize(20, 20); - connect(mnuBtn, TQT_SIGNAL(pressed()), this, - TQT_SLOT(menuButtonPressed())); + connect(mnuBtn, TQ_SIGNAL(pressed()), this, + TQ_SLOT(menuButtonPressed())); } else if(val == "Sticky"){ stickyBtn = new MyButton(widget(), "sticky"); @@ -303,7 +303,7 @@ void KWMThemeClient::init() stickyBtn->setPixmap(*pindownPix); else stickyBtn->setPixmap(*pinupPix); - connect(stickyBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT(toggleOnAllDesktops())); + connect(stickyBtn, TQ_SIGNAL( clicked() ), this, TQ_SLOT(toggleOnAllDesktops())); hb->addWidget(stickyBtn); stickyBtn->setFixedSize(20, 20); } @@ -311,7 +311,7 @@ void KWMThemeClient::init() btn = new MyButton(widget(), "iconify"); TQToolTip::add( btn, i18n("Minimize")); btn->setPixmap(*iconifyPix); - connect(btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(minimize())); + connect(btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(minimize())); hb->addWidget(btn); btn->setFixedSize(20, 20); } @@ -319,7 +319,7 @@ void KWMThemeClient::init() maxBtn = new MyButton(widget(), "max"); TQToolTip::add( maxBtn, i18n("Maximize")); maxBtn->setPixmap(*maxPix); - connect(maxBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(maximize())); + connect(maxBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(maximize())); hb->addWidget(maxBtn); maxBtn->setFixedSize(20, 20); } @@ -327,7 +327,7 @@ void KWMThemeClient::init() btn = new MyButton(widget(), "close"); TQToolTip::add( btn, i18n("Close")); btn->setPixmap(*closePix); - connect(btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeWindow())); + connect(btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(closeWindow())); hb->addWidget(btn); btn->setFixedSize(20, 20); } @@ -927,7 +927,7 @@ TODO extern "C" { - KDE_EXPORT KDecorationFactory *create_factory() + TDE_EXPORT KDecorationFactory *create_factory() { return new KWMTheme::KWMThemeFactory(); } diff --git a/twin/clients/kwmtheme/kwmthemeclient.h b/twin/clients/kwmtheme/kwmthemeclient.h index 58db3d14f..f611e89d2 100644 --- a/twin/clients/kwmtheme/kwmthemeclient.h +++ b/twin/clients/kwmtheme/kwmthemeclient.h @@ -24,7 +24,7 @@ protected: class KWMThemeClient : public KDecoration { - Q_OBJECT + TQ_OBJECT public: KWMThemeClient( KDecorationBridge* b, KDecorationFactory* f ); ~KWMThemeClient(){;} diff --git a/twin/clients/laptop/CMakeLists.txt b/twin/clients/laptop/CMakeLists.txt index 479de7a84..9fe25af3a 100644 --- a/twin/clients/laptop/CMakeLists.txt +++ b/twin/clients/laptop/CMakeLists.txt @@ -30,9 +30,9 @@ tde_create_translated_desktop( ) -##### twin3_laptop (module) ##################### +##### twin_laptop (module) ##################### -tde_add_kpart( twin3_laptop AUTOMOC +tde_add_kpart( twin_laptop AUTOMOC SOURCES laptopclient.cpp LINK tdecorations-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/twin/clients/laptop/Makefile.am b/twin/clients/laptop/Makefile.am index ccf1d359b..1788a8691 100644 --- a/twin/clients/laptop/Makefile.am +++ b/twin/clients/laptop/Makefile.am @@ -1,11 +1,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes) -kde_module_LTLIBRARIES = twin3_laptop.la +kde_module_LTLIBRARIES = twin_laptop.la -twin3_laptop_la_SOURCES = laptopclient.cpp -twin3_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -twin3_laptop_la_LIBADD = ../../lib/libtdecorations.la +twin_laptop_la_SOURCES = laptopclient.cpp +twin_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_laptop_la_LIBADD = ../../lib/libtdecorations.la METASOURCES = AUTO noinst_HEADERS = laptopclient.h diff --git a/twin/clients/laptop/laptop.desktop b/twin/clients/laptop/laptop.desktop index 27f569634..060b0cce2 100644 --- a/twin/clients/laptop/laptop.desktop +++ b/twin/clients/laptop/laptop.desktop @@ -1,3 +1,3 @@ [Desktop Entry] Name=Laptop -X-TDE-Library=twin3_laptop +X-TDE-Library=twin_laptop diff --git a/twin/clients/laptop/laptopclient.cpp b/twin/clients/laptop/laptopclient.cpp index 114b03f4d..b0bc659dd 100644 --- a/twin/clients/laptop/laptopclient.cpp +++ b/twin/clients/laptop/laptopclient.cpp @@ -65,7 +65,7 @@ static bool pixmaps_created = false; // ===================================== -extern "C" KDE_EXPORT KDecorationFactory* create_factory() +extern "C" TDE_EXPORT KDecorationFactory* create_factory() { return new Laptop::LaptopClientFactory(); } @@ -121,11 +121,11 @@ static void create_pixmaps() int i, x, y; titlePix = new TQPixmap(33, 12); TQBitmap mask(33, 12); - mask.fill(Qt::color0); + mask.fill(TQt::color0); p.begin(titlePix); maskPainter.begin(&mask); - maskPainter.setPen(Qt::color1); + maskPainter.setPen(TQt::color1); for(i=0, y=2; i < 3; ++i, y+=4){ for(x=1; x <= 33; x+=3){ p.setPen(options()->color(KDecoration::ColorTitleBar, true).light(150)); @@ -221,9 +221,9 @@ static void create_pixmaps() drawButtonFrame(iBtnDownPix2, g, true); if(tqGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 128) - btnForeground = Qt::black; + btnForeground = TQt::black; else - btnForeground = Qt::white; + btnForeground = TQt::white; } static void delete_pixmaps() @@ -290,7 +290,7 @@ void LaptopButton::setBitmap(const unsigned char *bitmap) deco = TQBitmap(8, 8, bitmap, true); else { deco = TQBitmap(8,8); - deco.fill(Qt::color0); + deco.fill(TQt::color0); } deco.setMask(deco); repaint(); @@ -472,7 +472,7 @@ void LaptopClient::paintEvent( TQPaintEvent* ) TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive()); TQRect r(widget()->rect()); - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawRect(r); // fill mid frame... diff --git a/twin/clients/modernsystem/CMakeLists.txt b/twin/clients/modernsystem/CMakeLists.txt index 5bb92031e..166e3aae5 100644 --- a/twin/clients/modernsystem/CMakeLists.txt +++ b/twin/clients/modernsystem/CMakeLists.txt @@ -31,9 +31,9 @@ tde_create_translated_desktop( ) -##### twin3_modernsys (module) ################## +##### twin_modernsys (module) ################## -tde_add_kpart( twin3_modernsys +tde_add_kpart( twin_modernsys SOURCES modernsys.cpp LINK tdecorations-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/twin/clients/modernsystem/Makefile.am b/twin/clients/modernsystem/Makefile.am index e4c21d7a3..902669685 100644 --- a/twin/clients/modernsystem/Makefile.am +++ b/twin/clients/modernsystem/Makefile.am @@ -3,11 +3,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes) SUBDIRS = config -kde_module_LTLIBRARIES = twin3_modernsys.la +kde_module_LTLIBRARIES = twin_modernsys.la -twin3_modernsys_la_SOURCES = modernsys.cpp -twin3_modernsys_la_LIBADD = ../../lib/libtdecorations.la -twin3_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_modernsys_la_SOURCES = modernsys.cpp +twin_modernsys_la_LIBADD = ../../lib/libtdecorations.la +twin_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module METASOURCES = AUTO noinst_HEADERS = modernsys.h diff --git a/twin/clients/modernsystem/config/config.cpp b/twin/clients/modernsystem/config/config.cpp index 18d6870f7..c353abc1b 100644 --- a/twin/clients/modernsystem/config/config.cpp +++ b/twin/clients/modernsystem/config/config.cpp @@ -12,7 +12,7 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config(TDEConfig* conf, TQWidget* parent) + TDE_EXPORT TQObject* allocate_config(TDEConfig* conf, TQWidget* parent) { return(new ModernSysConfig(conf, parent)); } @@ -44,20 +44,20 @@ ModernSysConfig::ModernSysConfig(TDEConfig* conf, TQWidget* parent) : TQObject(p "easier, especially for trackballs and other mouse replacements " "on laptops.")); layout->addMultiCellWidget(cbShowHandle, 0, 0, 0, 1); - connect(cbShowHandle, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged())); + connect(cbShowHandle, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectionChanged())); sliderBox = new TQVBox(handleBox); - handleSizeSlider = new TQSlider(0, 4, 1, 0, Qt::Horizontal, sliderBox); + handleSizeSlider = new TQSlider(0, 4, 1, 0, TQt::Horizontal, sliderBox); TQWhatsThis::add(handleSizeSlider, i18n("Here you can change the size of the resize handle.")); handleSizeSlider->setTickInterval(1); handleSizeSlider->setTickmarks(TQSlider::Below); - connect(handleSizeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSelectionChanged())); + connect(handleSizeSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSelectionChanged())); hbox = new TQHBox(sliderBox); hbox->setSpacing(6); - bool rtl = kapp->reverseLayout(); + bool rtl = tdeApp->reverseLayout(); label1 = new TQLabel(i18n("Small"), hbox); label1->setAlignment(rtl ? AlignRight : AlignLeft); label2 = new TQLabel(i18n("Medium"), hbox); diff --git a/twin/clients/modernsystem/config/config.h b/twin/clients/modernsystem/config/config.h index 20ce5539e..004dd9855 100644 --- a/twin/clients/modernsystem/config/config.h +++ b/twin/clients/modernsystem/config/config.h @@ -10,7 +10,7 @@ class ModernSysConfig : public TQObject { - Q_OBJECT + TQ_OBJECT public: ModernSysConfig(TDEConfig* conf, TQWidget* parent); diff --git a/twin/clients/modernsystem/modernsys.cpp b/twin/clients/modernsystem/modernsys.cpp index f2d31ed11..3777df9d8 100644 --- a/twin/clients/modernsystem/modernsys.cpp +++ b/twin/clients/modernsystem/modernsys.cpp @@ -185,9 +185,9 @@ static void create_pixmaps() if(tqGray(btnColor.background().rgb()) < 150) - buttonFg = new TQColor(Qt::white); + buttonFg = new TQColor(TQt::white); else - buttonFg = new TQColor(Qt::black); + buttonFg = new TQColor(TQt::black); delete lcDark1; delete lcDark2; @@ -342,7 +342,7 @@ void ModernButton::setBitmap(const unsigned char *bitmap) deco = TQBitmap(8, 8, bitmap, true); else { deco = TQBitmap(8,8); - deco.fill(Qt::color0); + deco.fill(TQt::color0); } deco.setMask(deco); } @@ -631,7 +631,7 @@ void ModernSys::paintEvent( TQPaintEvent* ) p.drawLine(width()-hw, height()-hs-1, width()-4, height()-hs-1); p.drawLine(width()-hs-1, height()-hw, width()-hs-1, height()-4); - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawRect(0, 0, w, h); // handle outline @@ -640,7 +640,7 @@ void ModernSys::paintEvent( TQPaintEvent* ) p.drawLine(width()-hs, height()-2, width()-2, height()-2); p.drawLine(width()-hs, height()-hw, width()-hs, height()-2); } else { - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawRect(0, 0, w, h); } } @@ -731,7 +731,7 @@ bool ModernSysFactory::supports( Ability ability ) } // KWin extended plugin interface -extern "C" KDE_EXPORT KDecorationFactory* create_factory() +extern "C" TDE_EXPORT KDecorationFactory* create_factory() { return new ModernSystem::ModernSysFactory(); } diff --git a/twin/clients/modernsystem/modernsystem.desktop b/twin/clients/modernsystem/modernsystem.desktop index 85a301733..76601f9f2 100644 --- a/twin/clients/modernsystem/modernsystem.desktop +++ b/twin/clients/modernsystem/modernsystem.desktop @@ -1,3 +1,3 @@ [Desktop Entry] Name=Modern System -X-TDE-Library=twin3_modernsys +X-TDE-Library=twin_modernsys diff --git a/twin/clients/plastik/CMakeLists.txt b/twin/clients/plastik/CMakeLists.txt index 695468994..8e920bdc2 100644 --- a/twin/clients/plastik/CMakeLists.txt +++ b/twin/clients/plastik/CMakeLists.txt @@ -34,9 +34,9 @@ tde_create_translated_desktop( ) -##### twin3_plastik (module) #################### +##### twin_plastik (module) #################### -tde_add_kpart( twin3_plastik AUTOMOC +tde_add_kpart( twin_plastik AUTOMOC SOURCES plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp LINK tdecorations-shared tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/twin/clients/plastik/Makefile.am b/twin/clients/plastik/Makefile.am index c1757891d..0afee676a 100644 --- a/twin/clients/plastik/Makefile.am +++ b/twin/clients/plastik/Makefile.am @@ -9,11 +9,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes) twindir = $(kde_datadir)/twin/ twin_DATA = plastik.desktop -kde_module_LTLIBRARIES = twin3_plastik.la -twin3_plastik_la_SOURCES = plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp -twin3_plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -twin3_plastik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la -twin3_plastik_la_METASOURCES = AUTO +kde_module_LTLIBRARIES = twin_plastik.la +twin_plastik_la_SOURCES = plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp +twin_plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_plastik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la +twin_plastik_la_METASOURCES = AUTO -DISTCLEANFILES = $(twin3_plastik_la_METASOURCES) +DISTCLEANFILES = $(twin_plastik_la_METASOURCES) diff --git a/twin/clients/plastik/config/config.cpp b/twin/clients/plastik/config/config.cpp index 04658796c..0fdc126e2 100644 --- a/twin/clients/plastik/config/config.cpp +++ b/twin/clients/plastik/config/config.cpp @@ -49,16 +49,16 @@ PlastikConfig::PlastikConfig(TDEConfig* config, TQWidget* parent) load(config); // setup the connections - connect(m_dialog->titleAlign, TQT_SIGNAL(clicked(int)), - this, TQT_SIGNAL(changed())); - connect(m_dialog->animateButtons, TQT_SIGNAL(toggled(bool)), - this, TQT_SIGNAL(changed())); - connect(m_dialog->menuClose, TQT_SIGNAL(toggled(bool)), - this, TQT_SIGNAL(changed())); - connect(m_dialog->titleShadow, TQT_SIGNAL(toggled(bool)), - this, TQT_SIGNAL(changed())); - connect(m_dialog->coloredBorder, TQT_SIGNAL(toggled(bool)), - this, TQT_SIGNAL(changed())); + connect(m_dialog->titleAlign, TQ_SIGNAL(clicked(int)), + this, TQ_SIGNAL(changed())); + connect(m_dialog->animateButtons, TQ_SIGNAL(toggled(bool)), + this, TQ_SIGNAL(changed())); + connect(m_dialog->menuClose, TQ_SIGNAL(toggled(bool)), + this, TQ_SIGNAL(changed())); + connect(m_dialog->titleShadow, TQ_SIGNAL(toggled(bool)), + this, TQ_SIGNAL(changed())); + connect(m_dialog->coloredBorder, TQ_SIGNAL(toggled(bool)), + this, TQ_SIGNAL(changed())); } PlastikConfig::~PlastikConfig() @@ -115,7 +115,7 @@ void PlastikConfig::defaults() extern "C" { - KDE_EXPORT TQObject* allocate_config(TDEConfig* config, TQWidget* parent) { + TDE_EXPORT TQObject* allocate_config(TDEConfig* config, TQWidget* parent) { return (new PlastikConfig(config, parent)); } } diff --git a/twin/clients/plastik/config/config.h b/twin/clients/plastik/config/config.h index 73231c50f..d83ebf149 100644 --- a/twin/clients/plastik/config/config.h +++ b/twin/clients/plastik/config/config.h @@ -32,7 +32,7 @@ class ConfigDialog; class PlastikConfig : public TQObject { - Q_OBJECT + TQ_OBJECT public: PlastikConfig(TDEConfig* config, TQWidget* parent); ~PlastikConfig(); diff --git a/twin/clients/plastik/config/configdialog.ui b/twin/clients/plastik/config/configdialog.ui index f751d8024..505d91b06 100644 --- a/twin/clients/plastik/config/configdialog.ui +++ b/twin/clients/plastik/config/configdialog.ui @@ -66,9 +66,6 @@ <property name="text"> <string>Colored window border</string> </property> - <property name="accel"> - <string></string> - </property> <property name="whatsThis" stdset="0"> <string>Check this option if the window border should be painted in the titlebar color. Otherwise it will be painted in the background color.</string> </property> diff --git a/twin/clients/plastik/misc.cpp b/twin/clients/plastik/misc.cpp index 1b259d383..053cf15ea 100644 --- a/twin/clients/plastik/misc.cpp +++ b/twin/clients/plastik/misc.cpp @@ -54,8 +54,8 @@ TQColor alphaBlendColors(const TQColor &bgColor, const TQColor &fgColor, const i { // normal button... - QRgb rgb = bgColor.rgb(); - QRgb rgb_b = fgColor.rgb(); + TQRgb rgb = bgColor.rgb(); + TQRgb rgb_b = fgColor.rgb(); int alpha = a; if(alpha>255) alpha = 255; if(alpha<0) alpha = 0; diff --git a/twin/clients/plastik/plastik.cpp b/twin/clients/plastik/plastik.cpp index b5cdeb85b..6f835fde8 100644 --- a/twin/clients/plastik/plastik.cpp +++ b/twin/clients/plastik/plastik.cpp @@ -185,9 +185,9 @@ void PlastikHandler::readConfig() m_titleHeightTool++; TQString value = config.readEntry("TitleAlignment", "AlignLeft"); - if (value == "AlignLeft") m_titleAlign = Qt::AlignLeft; - else if (value == "AlignHCenter") m_titleAlign = Qt::AlignHCenter; - else if (value == "AlignRight") m_titleAlign = Qt::AlignRight; + if (value == "AlignLeft") m_titleAlign = TQt::AlignLeft; + else if (value == "AlignHCenter") m_titleAlign = TQt::AlignHCenter; + else if (value == "AlignRight") m_titleAlign = TQt::AlignRight; m_coloredBorder = config.readBoolEntry("ColoredBorder", true); m_animateButtons = config.readBoolEntry("AnimateButtons", true); @@ -210,27 +210,27 @@ TQColor PlastikHandler::getColor(KWinPlastik::ColorType type, const bool active) break; case ShadeTitleLight: return alphaBlendColors(KDecoration::options()->color(ColorTitleBar, active), - Qt::white, active?205:215); + TQt::white, active?205:215); break; case ShadeTitleDark: return alphaBlendColors(KDecoration::options()->color(ColorTitleBar, active), - Qt::black, active?205:215); + TQt::black, active?205:215); break; case Border: return KDecoration::options()->color(ColorFrame, active); case TitleFont: return KDecoration::options()->color(ColorFont, active); default: - return Qt::black; + return TQt::black; } } -void PlastikHandler::pretile( TQPixmap *&pix, int size, Qt::Orientation dir ) const +void PlastikHandler::pretile( TQPixmap *&pix, int size, TQt::Orientation dir ) const { TQPixmap *newpix; TQPainter p; - if ( dir == Qt::Horizontal ) + if ( dir == TQt::Horizontal ) newpix = new TQPixmap( size, pix->height() ); else newpix = new TQPixmap( pix->width(), size ); @@ -300,7 +300,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo painter.end(); } - pretile(pm, 64, Qt::Horizontal); + pretile(pm, 64, TQt::Horizontal); break; } @@ -399,7 +399,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo painter.end(); - pretile(pm, 64, Qt::Vertical); + pretile(pm, 64, TQt::Vertical); break; } @@ -433,7 +433,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo } painter.end(); - pretile(pm, 64, Qt::Vertical); + pretile(pm, 64, TQt::Vertical); break; } @@ -523,7 +523,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo painter.drawPoint(0, h-1); painter.end(); - pretile(pm, 64, Qt::Horizontal); + pretile(pm, 64, TQt::Horizontal); break; } @@ -590,7 +590,7 @@ PlastikHandler* Handler() extern "C" { - KDE_EXPORT KDecorationFactory *create_factory() + TDE_EXPORT KDecorationFactory *create_factory() { KWinPlastik::handler = new KWinPlastik::PlastikHandler(); return KWinPlastik::handler; diff --git a/twin/clients/plastik/plastik.desktop b/twin/clients/plastik/plastik.desktop index cbe609785..564f33e5c 100644 --- a/twin/clients/plastik/plastik.desktop +++ b/twin/clients/plastik/plastik.desktop @@ -1,3 +1,3 @@ [Desktop Entry] Name=Plastik -X-TDE-Library=twin3_plastik +X-TDE-Library=twin_plastik diff --git a/twin/clients/plastik/plastik.h b/twin/clients/plastik/plastik.h index a4c1bc5b7..558ac848a 100644 --- a/twin/clients/plastik/plastik.h +++ b/twin/clients/plastik/plastik.h @@ -73,7 +73,7 @@ enum ButtonIcon { class PlastikHandler: public TQObject, public KDecorationFactory { - Q_OBJECT + TQ_OBJECT public: PlastikHandler(); ~PlastikHandler(); @@ -93,7 +93,7 @@ public: int borderSize() { return m_borderSize; } bool animateButtons() { return m_animateButtons; } bool menuClose() { return m_menuClose; } - TQ_Alignment titleAlign() { return m_titleAlign; } + TQt::AlignmentFlags titleAlign() { return m_titleAlign; } bool reverseLayout() { return m_reverse; } TQColor getColor(KWinPlastik::ColorType type, const bool active = true); @@ -101,7 +101,7 @@ public: private: void readConfig(); - void pretile(TQPixmap *&pix, int size, Qt::Orientation dir) const; + void pretile(TQPixmap *&pix, int size, TQt::Orientation dir) const; bool m_coloredBorder; bool m_titleShadow; @@ -113,7 +113,7 @@ private: int m_titleHeightTool; TQFont m_titleFont; TQFont m_titleFontTool; - TQ_Alignment m_titleAlign; + TQt::AlignmentFlags m_titleAlign; // pixmap cache TQPixmap *m_pixmaps[2][2][NumPixmaps]; // button pixmaps have normal+pressed state... diff --git a/twin/clients/plastik/plastikbutton.cpp b/twin/clients/plastik/plastikbutton.cpp index 3a097be15..3f3f81f62 100644 --- a/twin/clients/plastik/plastikbutton.cpp +++ b/twin/clients/plastik/plastikbutton.cpp @@ -51,7 +51,7 @@ PlastikButton::PlastikButton(ButtonType type, PlastikClient *parent, const char // no need to reset here as the button will be resetted on first resize. animTmr = new TQTimer(this); - connect(animTmr, TQT_SIGNAL(timeout() ), this, TQT_SLOT(animate() ) ); + connect(animTmr, TQ_SIGNAL(timeout() ), this, TQ_SLOT(animate() ) ); animProgress = 0; } @@ -170,17 +170,17 @@ void PlastikButton::drawButton(TQPainter *painter) if(type() == CloseButton) { highlightColor = TQColor(255,64,0); } else { - highlightColor = Qt::white; + highlightColor = TQt::white; } TQColor contourTop = alphaBlendColors(Handler()->getColor(TitleGradient2, active), - Qt::black, 215); + TQt::black, 215); TQColor contourBottom = alphaBlendColors(Handler()->getColor(TitleGradient3, active), - Qt::black, 215); + TQt::black, 215); TQColor sourfaceTop = alphaBlendColors(Handler()->getColor(TitleGradient2, active), - Qt::white, 210); + TQt::white, 210); TQColor sourfaceBottom = alphaBlendColors(Handler()->getColor(TitleGradient3, active), - Qt::white, 210); + TQt::white, 210); int highlightAlpha = static_cast<int>(255-((60/static_cast<double>(ANIMATIONSTEPS))* static_cast<double>(animProgress) ) ); @@ -190,10 +190,10 @@ void PlastikButton::drawButton(TQPainter *painter) sourfaceBottom = alphaBlendColors(sourfaceBottom, highlightColor, highlightAlpha); if (isDown() ) { - contourTop = alphaBlendColors(contourTop, Qt::black, 200); - contourBottom = alphaBlendColors(contourBottom, Qt::black, 200); - sourfaceTop = alphaBlendColors(sourfaceTop, Qt::black, 200); - sourfaceBottom = alphaBlendColors(sourfaceBottom, Qt::black, 200); + contourTop = alphaBlendColors(contourTop, TQt::black, 200); + contourBottom = alphaBlendColors(contourBottom, TQt::black, 200); + sourfaceTop = alphaBlendColors(sourfaceTop, TQt::black, 200); + sourfaceBottom = alphaBlendColors(sourfaceBottom, TQt::black, 200); } TQPixmap buffer; @@ -291,10 +291,10 @@ TQBitmap IconEngine::icon(ButtonIcon icon, int size) --size; TQBitmap bitmap(size,size); - bitmap.fill(Qt::color0); + bitmap.fill(TQt::color0); TQPainter p(&bitmap); - p.setPen(Qt::color1); + p.setPen(TQt::color1); TQRect r = bitmap.rect(); diff --git a/twin/clients/plastik/plastikbutton.h b/twin/clients/plastik/plastikbutton.h index dbebcf63f..6deaa56f6 100644 --- a/twin/clients/plastik/plastikbutton.h +++ b/twin/clients/plastik/plastikbutton.h @@ -37,7 +37,7 @@ class PlastikClient; class PlastikButton : public KCommonDecorationButton { - Q_OBJECT + TQ_OBJECT public: PlastikButton(ButtonType type, PlastikClient *parent, const char *name); ~PlastikButton(); @@ -65,7 +65,7 @@ private: /** * This class creates bitmaps which can be used as icons on buttons. The icons * are "hardcoded". - * Over the previous "Gimp->xpm->QImage->recolor->SmoothScale->TQPixmap" solution + * Over the previous "Gimp->xpm->TQImage->recolor->SmoothScale->TQPixmap" solution * it has the important advantage that icons are more scalable and at the same * time sharp and not blurred. */ diff --git a/twin/clients/plastik/plastikclient.cpp b/twin/clients/plastik/plastikclient.cpp index 31c9e2ad9..bb2c465a6 100644 --- a/twin/clients/plastik/plastikclient.cpp +++ b/twin/clients/plastik/plastikclient.cpp @@ -394,7 +394,7 @@ TQRect PlastikClient::captionRect() const buttonsLeftWidth() - buttonsRightWidth() - marginLeft - marginRight; - TQ_Alignment a = Handler()->titleAlign(); + TQt::AlignmentFlags a = Handler()->titleAlign(); int tX, tW; // position/width of the title buffer if (caption.width() > titleWidth) { @@ -402,10 +402,10 @@ TQRect PlastikClient::captionRect() const } else { tW = caption.width(); } - if (a == Qt::AlignLeft || (caption.width() > titleWidth) ) { + if (a == TQt::AlignLeft || (caption.width() > titleWidth) ) { // Align left tX = titleLeft; - } else if (a == Qt::AlignHCenter) { + } else if (a == TQt::AlignHCenter) { // Align center tX = titleLeft+(titleWidth- caption.width() )/2; } else { diff --git a/twin/clients/quartz/CMakeLists.txt b/twin/clients/quartz/CMakeLists.txt index 49d56d419..70d9fb49a 100644 --- a/twin/clients/quartz/CMakeLists.txt +++ b/twin/clients/quartz/CMakeLists.txt @@ -32,9 +32,9 @@ tde_create_translated_desktop( ) -##### twin3_quartz (module) ##################### +##### twin_quartz (module) ##################### -tde_add_kpart( twin3_quartz AUTOMOC +tde_add_kpart( twin_quartz AUTOMOC SOURCES quartz.cpp LINK tdecorations-shared tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/twin/clients/quartz/Makefile.am b/twin/clients/quartz/Makefile.am index 3a5709773..ae69a53a6 100644 --- a/twin/clients/quartz/Makefile.am +++ b/twin/clients/quartz/Makefile.am @@ -3,11 +3,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes) SUBDIRS = . config -kde_module_LTLIBRARIES = twin3_quartz.la +kde_module_LTLIBRARIES = twin_quartz.la -twin3_quartz_la_SOURCES = quartz.cpp -twin3_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -twin3_quartz_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la +twin_quartz_la_SOURCES = quartz.cpp +twin_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_quartz_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la METASOURCES = AUTO noinst_HEADERS = quartz.h diff --git a/twin/clients/quartz/config/config.cpp b/twin/clients/quartz/config/config.cpp index 70dc87965..f6bd853b1 100644 --- a/twin/clients/quartz/config/config.cpp +++ b/twin/clients/quartz/config/config.cpp @@ -15,7 +15,7 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) + TDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) { return(new QuartzConfig(conf, parent)); } @@ -49,8 +49,8 @@ QuartzConfig::QuartzConfig( TDEConfig* conf, TQWidget* parent ) load( conf ); // Ensure we track user changes properly - connect( cbColorBorder, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()) ); - connect( cbExtraSmall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()) ); + connect( cbColorBorder, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectionChanged()) ); + connect( cbExtraSmall, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectionChanged()) ); // Make the widgets visible in twindecoration gb->show(); diff --git a/twin/clients/quartz/config/config.h b/twin/clients/quartz/config/config.h index e43c18179..a468d8703 100644 --- a/twin/clients/quartz/config/config.h +++ b/twin/clients/quartz/config/config.h @@ -16,7 +16,7 @@ class QuartzConfig: public TQObject { - Q_OBJECT + TQ_OBJECT public: QuartzConfig( TDEConfig* conf, TQWidget* parent ); diff --git a/twin/clients/quartz/quartz.cpp b/twin/clients/quartz/quartz.cpp index b9762551c..31a0dbcf1 100644 --- a/twin/clients/quartz/quartz.cpp +++ b/twin/clients/quartz/quartz.cpp @@ -463,7 +463,7 @@ void QuartzButton::drawButton(TQPainter *p) { int xOff = (width()-10)/2; int yOff = (height()-10)/2; - p->setPen( Qt::black ); + p->setPen( TQt::black ); p->drawPixmap(isDown() ? xOff+2: xOff+1, isDown() ? yOff+2 : yOff+1, *deco); p->setPen( KDecoration::options()->color(KDecoration::ColorButtonBg, decoration()->isActive()).light(150) ); p->drawPixmap(isDown() ? xOff+1: xOff, isDown() ? yOff+1 : yOff, *deco); @@ -723,7 +723,7 @@ void QuartzClient::paintEvent( TQPaintEvent* ) // Draw the title bar. // =================== int r_x, r_y, r_x2, r_y2; - TQT_TQRECT_OBJECT(widget()->rect()).coords(&r_x, &r_y, &r_x2, &r_y2); + widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2); const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft); const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop); const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight); @@ -783,7 +783,7 @@ void QuartzClient::paintEvent( TQPaintEvent* ) ///////////////////////////////// extern "C" { - KDE_EXPORT KDecorationFactory *create_factory() + TDE_EXPORT KDecorationFactory *create_factory() { Quartz::clientHandler = new Quartz::QuartzHandler(); return Quartz::clientHandler; diff --git a/twin/clients/quartz/quartz.desktop b/twin/clients/quartz/quartz.desktop index 8083eec1f..ef69ddda3 100644 --- a/twin/clients/quartz/quartz.desktop +++ b/twin/clients/quartz/quartz.desktop @@ -1,3 +1,3 @@ [Desktop Entry] Name=Quartz -X-TDE-Library=twin3_quartz +X-TDE-Library=twin_quartz diff --git a/twin/clients/quartz/quartz.h b/twin/clients/quartz/quartz.h index d0ab64faf..d0db8b103 100644 --- a/twin/clients/quartz/quartz.h +++ b/twin/clients/quartz/quartz.h @@ -30,7 +30,7 @@ class QuartzClient; class QuartzHandler: public TQObject, public KDecorationFactory { - Q_OBJECT + TQ_OBJECT public: QuartzHandler(); ~QuartzHandler(); diff --git a/twin/clients/redmond/CMakeLists.txt b/twin/clients/redmond/CMakeLists.txt index 7240233a0..17a13bac9 100644 --- a/twin/clients/redmond/CMakeLists.txt +++ b/twin/clients/redmond/CMakeLists.txt @@ -30,9 +30,9 @@ tde_create_translated_desktop( ) -##### twin3_redmond (module) #################### +##### twin_redmond (module) #################### -tde_add_kpart( twin3_redmond AUTOMOC +tde_add_kpart( twin_redmond AUTOMOC SOURCES redmond.cpp LINK tdecorations-shared tdecore-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/twin/clients/redmond/Makefile.am b/twin/clients/redmond/Makefile.am index 39985f347..c00af257e 100644 --- a/twin/clients/redmond/Makefile.am +++ b/twin/clients/redmond/Makefile.am @@ -1,11 +1,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes) -kde_module_LTLIBRARIES = twin3_redmond.la +kde_module_LTLIBRARIES = twin_redmond.la -twin3_redmond_la_SOURCES = redmond.cpp -twin3_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -twin3_redmond_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.la +twin_redmond_la_SOURCES = redmond.cpp +twin_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_redmond_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.la METASOURCES = AUTO noinst_HEADERS = redmond.h diff --git a/twin/clients/redmond/redmond.cpp b/twin/clients/redmond/redmond.cpp index c59cd48d1..006f19122 100644 --- a/twin/clients/redmond/redmond.cpp +++ b/twin/clients/redmond/redmond.cpp @@ -210,9 +210,9 @@ static void create_pixmaps () // Make sure button pixmaps contrast with the current colour scheme. if (tqGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 127) - btnForeground = new TQColor(Qt::black); + btnForeground = new TQColor(TQt::black); else - btnForeground = new TQColor(Qt::white); + btnForeground = new TQColor(TQt::white); } void delete_pixmaps() @@ -283,7 +283,7 @@ void RedmondButton::setBitmap(const unsigned char *bitmap) deco = TQBitmap(10, 10, bitmap, true); else { deco = TQBitmap(10,10); - deco.fill(Qt::color0); + deco.fill(TQt::color0); } deco.setMask(deco); } @@ -556,7 +556,7 @@ void RedmondDeco::paintEvent( TQPaintEvent* ) TQImage image = KImageEffect::gradient(titleBuffer->size(), c1, c2, KImageEffect::HorizontalGradient); - titleBuffer->convertFromImage(image, Qt::OrderedDither); + titleBuffer->convertFromImage(image, TQt::OrderedDither); } TQPainter p2( titleBuffer, this ); @@ -688,7 +688,7 @@ TQValueList< RedmondDecoFactory::BorderSize > RedmondDecoFactory::borderSizes() } -extern "C" KDE_EXPORT KDecorationFactory *create_factory() +extern "C" TDE_EXPORT KDecorationFactory *create_factory() { return new Redmond::RedmondDecoFactory(); } diff --git a/twin/clients/redmond/redmond.desktop b/twin/clients/redmond/redmond.desktop index d6bf0a9b0..68a360be0 100644 --- a/twin/clients/redmond/redmond.desktop +++ b/twin/clients/redmond/redmond.desktop @@ -1,3 +1,3 @@ [Desktop Entry] Name=Redmond -X-TDE-Library=twin3_redmond +X-TDE-Library=twin_redmond diff --git a/twin/clients/redmond/redmond.h b/twin/clients/redmond/redmond.h index 211763535..3ef7337fb 100644 --- a/twin/clients/redmond/redmond.h +++ b/twin/clients/redmond/redmond.h @@ -29,7 +29,7 @@ class RedmondDeco; class RedmondButton : public KCommonDecorationButton { - Q_OBJECT + TQ_OBJECT public: RedmondButton(ButtonType type, RedmondDeco *parent, const char *name); void setBitmap(const unsigned char *bitmap); @@ -72,7 +72,7 @@ private: class RedmondDecoFactory : public TQObject, public KDecorationFactory { - Q_OBJECT + TQ_OBJECT public: RedmondDecoFactory(); virtual ~RedmondDecoFactory(); diff --git a/twin/clients/test/Makefile.am b/twin/clients/test/Makefile.am index 07ac72c02..f25bc0b3e 100644 --- a/twin/clients/test/Makefile.am +++ b/twin/clients/test/Makefile.am @@ -1,10 +1,10 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes) -kde_module_LTLIBRARIES = twin3_test.la +kde_module_LTLIBRARIES = twin_test.la -twin3_test_la_SOURCES = test.cpp -twin3_test_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -twin3_test_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la +twin_test_la_SOURCES = test.cpp +twin_test_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_test_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la #twin_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) METASOURCES = AUTO diff --git a/twin/clients/test/test.cpp b/twin/clients/test/test.cpp index e01d1d98e..113254f98 100644 --- a/twin/clients/test/test.cpp +++ b/twin/clients/test/test.cpp @@ -22,9 +22,9 @@ void Decoration::init() { button = new TQPushButton( widget()); button->show(); - button->setCursor( tqarrowCursor ); + button->setCursor( TQt::arrowCursor ); button->move( 0, 0 ); - connect( button, TQT_SIGNAL( clicked()), TQT_SLOT( closeWindow())); + connect( button, TQ_SIGNAL( clicked()), TQ_SLOT( closeWindow())); TQToolTip::add( button, "Zelva Mana" ); } } @@ -100,13 +100,13 @@ TQSize Decoration::minimumSize() const bool Decoration::eventFilter( TQObject* o, TQEvent* e ) { - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(widget())) + if( o == widget()) { switch( e->type()) { case TQEvent::MouseButtonPress: { // FRAME - processMousePressEvent( TQT_TQMOUSEEVENT( e )); + processMousePressEvent( static_cast<TQMouseEvent*>( e )); return true; } case TQEvent::Show: @@ -333,7 +333,7 @@ bool Factory::reset( unsigned long changed ) extern "C" { -KDE_EXPORT KDecorationFactory *create_factory() +TDE_EXPORT KDecorationFactory *create_factory() { return new KWinTest::Factory(); } diff --git a/twin/clients/test/test.desktop b/twin/clients/test/test.desktop index 04e9ebaeb..17a13bad8 100644 --- a/twin/clients/test/test.desktop +++ b/twin/clients/test/test.desktop @@ -1,3 +1,3 @@ [Desktop Entry] Name=KWin test -X-TDE-Library=twin3_test +X-TDE-Library=twin_test diff --git a/twin/clients/test/test.h b/twin/clients/test/test.h index bfe36fa7c..f735df6c4 100644 --- a/twin/clients/test/test.h +++ b/twin/clients/test/test.h @@ -15,7 +15,7 @@ const int SUPPORTED_WINDOW_TYPES_MASK = NET::NormalMask | NET::DesktopMask | NET class Decoration : public KDecoration { - Q_OBJECT + TQ_OBJECT public: Decoration( KDecorationBridge* bridge, KDecorationFactory* factory ); virtual void init(); diff --git a/twin/clients/web/CMakeLists.txt b/twin/clients/web/CMakeLists.txt index 6045bcbb0..5547dabe7 100644 --- a/twin/clients/web/CMakeLists.txt +++ b/twin/clients/web/CMakeLists.txt @@ -29,9 +29,9 @@ tde_create_translated_desktop( ) -##### twin3_web (module) ######################## +##### twin_web (module) ######################## -tde_add_kpart( twin3_web AUTOMOC +tde_add_kpart( twin_web AUTOMOC SOURCES Web.cpp WebButton.cpp LINK tdecorations-shared tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/twin/clients/web/Makefile.am b/twin/clients/web/Makefile.am index 4855602ca..ba3efcb59 100644 --- a/twin/clients/web/Makefile.am +++ b/twin/clients/web/Makefile.am @@ -1,12 +1,12 @@ INCLUDES = -I$(top_srcdir) $(all_includes) -kde_module_LTLIBRARIES = twin3_web.la +kde_module_LTLIBRARIES = twin_web.la -twin3_web_la_SOURCES = Web.cpp WebButton.cpp +twin_web_la_SOURCES = Web.cpp WebButton.cpp noinst_HEADERS = Web.h WebButton.h -twin3_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -twin3_web_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la +twin_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_web_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la METASOURCES = AUTO linkdir = $(kde_datadir)/twin/ diff --git a/twin/clients/web/Web.cpp b/twin/clients/web/Web.cpp index 2c0ffc8f9..f40dc552b 100644 --- a/twin/clients/web/Web.cpp +++ b/twin/clients/web/Web.cpp @@ -29,7 +29,7 @@ extern "C" { - KDE_EXPORT KDecorationFactory *create_factory() + TDE_EXPORT KDecorationFactory *create_factory() { return new Web::WebFactory(); } @@ -216,7 +216,7 @@ WebClient::reset( unsigned long changed ) WebClient::paintEvent(TQPaintEvent * pe) { int r_x, r_y, r_x2, r_y2; - TQT_TQRECT_OBJECT(widget()->rect()).coords(&r_x, &r_y, &r_x2, &r_y2); + widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2); const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft); const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop); const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight); @@ -230,7 +230,7 @@ WebClient::paintEvent(TQPaintEvent * pe) TQPainter p(widget()); - p.setPen(Qt::black); + p.setPen(TQt::black); p.setBrush(options()->colorGroup(ColorFrame, isActive()).background()); p.setClipRegion(pe->region() - titleRect); diff --git a/twin/clients/web/Web.h b/twin/clients/web/Web.h index d73f370d3..175928c91 100644 --- a/twin/clients/web/Web.h +++ b/twin/clients/web/Web.h @@ -69,7 +69,7 @@ namespace Web class WebFactory : public TQObject, public KDecorationFactory { - Q_OBJECT + TQ_OBJECT public: diff --git a/twin/clients/web/WebButton.cpp b/twin/clients/web/WebButton.cpp index f8d1c4add..eb6d8d530 100644 --- a/twin/clients/web/WebButton.cpp +++ b/twin/clients/web/WebButton.cpp @@ -170,7 +170,7 @@ WebButton::drawButton(TQPainter *p) { // Draw edge. - p->setPen(Qt::black); + p->setPen(TQt::black); p->drawLine(0, 0, width(), 0); p->drawLine(0, 1, 0, height() - 1); @@ -207,7 +207,7 @@ WebButton::drawButton(TQPainter *p) { // Draw edge. - p->setPen(Qt::black); + p->setPen(TQt::black); p->drawLine(0, 0, width(), 0); p->drawLine(width() - 1, 1, width() - 1, height() - 1); if (shape_) @@ -244,7 +244,7 @@ WebButton::drawButton(TQPainter *p) { // Draw edge. - p->setPen(Qt::black); + p->setPen(TQt::black); p->drawLine(0, 0, width(), 0); // Draw highlight. @@ -266,7 +266,7 @@ WebButton::drawButton(TQPainter *p) int bhby2(bitmap_.height() / 2); // Bitmap Height BY 2 p->setBrush(NoBrush); - p->setPen(Qt::black); + p->setPen(TQt::black); p->drawPixmap(center.x() - bwby2 + 1, center.y() - bhby2 + 1, bitmap_); } diff --git a/twin/clients/web/web.desktop b/twin/clients/web/web.desktop index 10a05ccf1..e850418a4 100644 --- a/twin/clients/web/web.desktop +++ b/twin/clients/web/web.desktop @@ -1,3 +1,3 @@ [Desktop Entry] Name=Web -X-TDE-Library=twin3_web +X-TDE-Library=twin_web |