diff options
Diffstat (limited to 'twin/clients/test')
-rw-r--r-- | twin/clients/test/Makefile.am | 8 | ||||
-rw-r--r-- | twin/clients/test/test.cpp | 10 | ||||
-rw-r--r-- | twin/clients/test/test.desktop | 2 | ||||
-rw-r--r-- | twin/clients/test/test.h | 2 |
4 files changed, 11 insertions, 11 deletions
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(); |