diff options
Diffstat (limited to 'twin/clients/default')
-rw-r--r-- | twin/clients/default/CMakeLists.txt | 4 | ||||
-rw-r--r-- | twin/clients/default/Makefile.am | 8 | ||||
-rw-r--r-- | twin/clients/default/config/config.cpp | 13 | ||||
-rw-r--r-- | twin/clients/default/config/config.h | 3 | ||||
-rw-r--r-- | twin/clients/default/kdedefault.cpp | 17 | ||||
-rw-r--r-- | twin/clients/default/kdedefault.h | 2 |
6 files changed, 20 insertions, 27 deletions
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 f479c0c69..36ddb1402 100644 --- a/twin/clients/default/config/config.cpp +++ b/twin/clients/default/config/config.cpp @@ -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(); @@ -128,4 +128,3 @@ void KDEDefaultConfig::defaults() } #include "config.moc" -// vim: ts=4 diff --git a/twin/clients/default/config/config.h b/twin/clients/default/config/config.h index a09ac1ab3..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 ); @@ -46,4 +46,3 @@ class KDEDefaultConfig: public TQObject }; #endif -// vim: ts=4 diff --git a/twin/clients/default/kdedefault.cpp b/twin/clients/default/kdedefault.cpp index 7892c4adc..3513ca5df 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, @@ -1064,6 +1064,3 @@ extern "C" KDE_EXPORT KDecorationFactory* create_factory() { return new Default::KDEDefaultHandler(); } - -// vim: ts=4 -// kate: space-indent off; tab-width 4; diff --git a/twin/clients/default/kdedefault.h b/twin/clients/default/kdedefault.h index 70b8847fa..4c89132e2 100644 --- a/twin/clients/default/kdedefault.h +++ b/twin/clients/default/kdedefault.h @@ -99,5 +99,3 @@ class KDEDefaultClient : public KCommonDecoration } #endif -// vim: ts=4 -// kate: space-indent off; tab-width 4; |