diff --git a/clients/b2/CMakeLists.txt b/clients/b2/CMakeLists.txt index 1fcb591055..1f51b73a2e 100644 --- a/clients/b2/CMakeLists.txt +++ b/clients/b2/CMakeLists.txt @@ -1,4 +1,4 @@ -add_definitions (-DQT3_SUPPORT) +add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS) add_subdirectory( config ) diff --git a/clients/keramik/CMakeLists.txt b/clients/keramik/CMakeLists.txt index 17bb4eed45..979850334d 100644 --- a/clients/keramik/CMakeLists.txt +++ b/clients/keramik/CMakeLists.txt @@ -1,23 +1,15 @@ -add_definitions (-DQT3_SUPPORT) - add_subdirectory( config ) -########### next target ############### - set(kwin3_keramik_PART_SRCS keramik.cpp ) - qt4_add_resources(kwin3_keramik_PART_SRCS tiles.qrc ) kde4_add_plugin(kwin3_keramik ${kwin3_keramik_PART_SRCS}) - - -target_link_libraries(kwin3_keramik ${KDE4_KDEUI_LIBS} kdecorations ${QT_QT3SUPPORT_LIBRARY} ${QT_QTGUI_LIBRARY}) +target_link_libraries(kwin3_keramik ${KDE4_KDEUI_LIBS} kdecorations) install(TARGETS kwin3_keramik DESTINATION ${PLUGIN_INSTALL_DIR} ) - ########### install files ############### install( FILES keramik.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) diff --git a/clients/keramik/keramik.cpp b/clients/keramik/keramik.cpp index 3ddf6b1166..52fd7fd4e7 100644 --- a/clients/keramik/keramik.cpp +++ b/clients/keramik/keramik.cpp @@ -721,7 +721,7 @@ QList< KeramikHandler::BorderSize > KeramikHandler::borderSizes() const -KeramikButton::KeramikButton( KeramikClient* c, const char *name, Button btn, const QString &tip, const int realizeBtns ) +KeramikButton::KeramikButton( KeramikClient* c, Button btn, const QString &tip, const int realizeBtns ) : QAbstractButton( c->widget() ), client( c ), button( btn ), hover( false ), lastbutton( Qt::NoButton ) { @@ -883,7 +883,7 @@ void KeramikClient::init() connect( this, SIGNAL( keepAboveChanged( bool )), SLOT( keepAboveChange( bool ))); connect( this, SIGNAL( keepBelowChanged( bool )), SLOT( keepBelowChange( bool ))); - createMainWidget( Qt::WResizeNoErase ); + createMainWidget(); widget()->setAttribute( Qt::WA_StaticContents ); widget()->installEventFilter( this ); @@ -1021,7 +1021,7 @@ void KeramikClient::addButtons( QBoxLayout *layout, const QString &s ) // Menu button case 'M' : if ( !button[MenuButton] ) { - button[MenuButton] = new KeramikButton( this, "menu", MenuButton, i18n("Menu"), Qt::LeftButton|Qt::RightButton ); + button[MenuButton] = new KeramikButton( this, MenuButton, i18n("Menu"), Qt::LeftButton|Qt::RightButton ); connect( button[MenuButton], SIGNAL( pressed() ), SLOT( menuButtonPressed() ) ); layout->addWidget( button[MenuButton] ); } @@ -1030,7 +1030,7 @@ void KeramikClient::addButtons( QBoxLayout *layout, const QString &s ) // OnAllDesktops button case 'S' : if ( !button[OnAllDesktopsButton] ) { - button[OnAllDesktopsButton] = new KeramikButton( this, "on_all_desktops", + button[OnAllDesktopsButton] = new KeramikButton( this, OnAllDesktopsButton, isOnAllDesktops()?i18n("Not on all desktops"):i18n("On all desktops") ); if(isOnAllDesktops()) button[OnAllDesktopsButton]->toggle(); @@ -1042,7 +1042,7 @@ void KeramikClient::addButtons( QBoxLayout *layout, const QString &s ) // Help button case 'H' : if ( !button[HelpButton] && providesContextHelp() ) { - button[HelpButton] = new KeramikButton( this, "help", HelpButton, i18n("Help") ); + button[HelpButton] = new KeramikButton( this, HelpButton, i18n("Help") ); connect( button[HelpButton], SIGNAL( clicked() ), SLOT( showContextHelp() ) ); layout->addWidget( button[HelpButton] ); } @@ -1051,7 +1051,7 @@ void KeramikClient::addButtons( QBoxLayout *layout, const QString &s ) // Minimize button case 'I' : if ( !button[MinButton] && isMinimizable() ) { - button[MinButton] = new KeramikButton( this, "minimize", MinButton, i18n("Minimize") ); + button[MinButton] = new KeramikButton( this, MinButton, i18n("Minimize") ); connect( button[MinButton], SIGNAL( clicked() ), SLOT( minimize() ) ); layout->addWidget( button[MinButton] ); } @@ -1060,7 +1060,7 @@ void KeramikClient::addButtons( QBoxLayout *layout, const QString &s ) // Maximize button case 'A' : if ( !button[MaxButton] && isMaximizable() ) { - button[MaxButton] = new KeramikButton( this, "maximize", MaxButton, i18n("Maximize"), Qt::LeftButton|Qt::MidButton|Qt::RightButton ); + button[MaxButton] = new KeramikButton( this, MaxButton, i18n("Maximize"), Qt::LeftButton|Qt::MidButton|Qt::RightButton ); connect( button[MaxButton], SIGNAL( clicked() ), SLOT( slotMaximize() ) ); layout->addWidget( button[MaxButton] ); } @@ -1069,7 +1069,7 @@ void KeramikClient::addButtons( QBoxLayout *layout, const QString &s ) // Close button case 'X' : if ( !button[CloseButton] && isCloseable() ) { - button[CloseButton] = new KeramikButton( this, "close", CloseButton, i18n("Close") ); + button[CloseButton] = new KeramikButton( this, CloseButton, i18n("Close") ); connect( button[CloseButton], SIGNAL( clicked() ), SLOT( closeWindow() ) ); layout->addWidget( button[CloseButton] ); } @@ -1078,7 +1078,7 @@ void KeramikClient::addButtons( QBoxLayout *layout, const QString &s ) // Above button case 'F' : if ( !button[AboveButton]) { - button[AboveButton] = new KeramikButton( this, "above", AboveButton, i18n("Keep Above Others") ); + button[AboveButton] = new KeramikButton( this, AboveButton, i18n("Keep Above Others") ); connect( button[AboveButton], SIGNAL( clicked() ), SLOT( slotAbove() ) ); layout->addWidget( button[AboveButton] ); } @@ -1087,7 +1087,7 @@ void KeramikClient::addButtons( QBoxLayout *layout, const QString &s ) // Below button case 'B' : if ( !button[BelowButton]) { - button[BelowButton] = new KeramikButton( this, "below", BelowButton, i18n("Keep Below Others") ); + button[BelowButton] = new KeramikButton( this, BelowButton, i18n("Keep Below Others") ); connect( button[BelowButton], SIGNAL( clicked() ), SLOT( slotBelow() ) ); layout->addWidget( button[BelowButton] ); } @@ -1096,7 +1096,7 @@ void KeramikClient::addButtons( QBoxLayout *layout, const QString &s ) // Shade button case 'L' : if ( !button[ShadeButton] && isShadeable() ) { - button[ShadeButton] = new KeramikButton( this, "shade", ShadeButton, + button[ShadeButton] = new KeramikButton( this, ShadeButton, isSetShade() ? i18n("Unshade") : i18n( "Shade" )); connect( button[ShadeButton], SIGNAL( clicked() ), SLOT( slotShade() ) ); layout->addWidget( button[ShadeButton] ); diff --git a/clients/keramik/keramik.h b/clients/keramik/keramik.h index 3998276514..c7e14d3908 100644 --- a/clients/keramik/keramik.h +++ b/clients/keramik/keramik.h @@ -111,7 +111,7 @@ namespace Keramik { class KeramikButton : public QAbstractButton { public: - KeramikButton( KeramikClient *, const char *, Button, const QString &, const int realizeBtns = Qt::LeftButton ); + KeramikButton( KeramikClient *, Button, const QString &, const int realizeBtns = Qt::LeftButton ); ~KeramikButton(); Qt::MouseButtons lastButton() const { return lastbutton; } diff --git a/clients/modernsystem/CMakeLists.txt b/clients/modernsystem/CMakeLists.txt index bf7b6f5d9f..e8841ce09b 100644 --- a/clients/modernsystem/CMakeLists.txt +++ b/clients/modernsystem/CMakeLists.txt @@ -1,4 +1,4 @@ -add_definitions (-DQT3_SUPPORT) +add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS) add_subdirectory( config ) diff --git a/clients/oxygen/CMakeLists.txt b/clients/oxygen/CMakeLists.txt index f4f166f4c7..d8fd3a01f5 100644 --- a/clients/oxygen/CMakeLists.txt +++ b/clients/oxygen/CMakeLists.txt @@ -1,4 +1,4 @@ -add_definitions (-DQT3_SUPPORT) +add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS) ########### next target ############### diff --git a/clients/quartz/CMakeLists.txt b/clients/quartz/CMakeLists.txt index e3b856b56b..78f434b5f2 100644 --- a/clients/quartz/CMakeLists.txt +++ b/clients/quartz/CMakeLists.txt @@ -1,4 +1,4 @@ -add_definitions (-DQT3_SUPPORT) +add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS) add_subdirectory( config ) diff --git a/clients/redmond/CMakeLists.txt b/clients/redmond/CMakeLists.txt index 39d446ba39..c642b5666b 100644 --- a/clients/redmond/CMakeLists.txt +++ b/clients/redmond/CMakeLists.txt @@ -1,17 +1,13 @@ -add_definitions (-DQT3_SUPPORT) - -########### next target ############### +add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS) set(kwin3_redmond_PART_SRCS redmond.cpp) - kde4_add_plugin(kwin3_redmond ${kwin3_redmond_PART_SRCS}) target_link_libraries(kwin3_redmond kdecorations) install(TARGETS kwin3_redmond DESTINATION ${PLUGIN_INSTALL_DIR}) - ########### install files ############### install( FILES redmond.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) diff --git a/kcmkwin/kwindecoration/CMakeLists.txt b/kcmkwin/kwindecoration/CMakeLists.txt index 13cabb2037..47a4667420 100644 --- a/kcmkwin/kwindecoration/CMakeLists.txt +++ b/kcmkwin/kwindecoration/CMakeLists.txt @@ -1,15 +1,10 @@ -add_definitions (-DQT3_SUPPORT) - -########### next target ############### +add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS) set(kcm_kwindecoration_PART_SRCS kwindecoration.cpp buttons.cpp preview.cpp ) kde4_add_plugin(kcm_kwindecoration ${kcm_kwindecoration_PART_SRCS}) target_link_libraries(kcm_kwindecoration ${KDE4_KDE3SUPPORT_LIBS} kdecorations ${X11_LIBRARIES}) install(TARGETS kcm_kwindecoration DESTINATION ${PLUGIN_INSTALL_DIR} ) - ########### install files ############### install( FILES kwindecoration.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) - - diff --git a/kcmkwin/kwinrules/CMakeLists.txt b/kcmkwin/kwinrules/CMakeLists.txt index 5bb3f9705c..ab84218718 100644 --- a/kcmkwin/kwinrules/CMakeLists.txt +++ b/kcmkwin/kwinrules/CMakeLists.txt @@ -1,4 +1,4 @@ -ADD_DEFINITIONS(-DKCMRULES -DQT3_SUPPORT) +ADD_DEFINITIONS(-DKCMRULES -DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS) ########### next target ############### set(kwinrules_SRCS ruleswidget.cpp ruleslist.cpp kwinsrc.cpp detectwidget.cpp)