SVN commit 762281 by uwolfer: Q3 support cleanups M +0 -3 CMakeLists.txt M +3 -6 acctselect.cpp M +0 -2 modeminfo.cpp --- trunk/KDE/kdenetwork/kppp/CMakeLists.txt #762280:762281 @@ -13,9 +13,6 @@ add_subdirectory( Rules ) add_subdirectory( DB ) - -add_definitions ( -DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS) - ########### next target ############### set(kppp_SRCS --- trunk/KDE/kdenetwork/kppp/acctselect.cpp #762280:762281 @@ -32,16 +32,13 @@ // //--------------------------------------------------------------------------- - +#define QT3_SUPPORT +#include +#undef QT3_SUPPORT #include #include -//Added by qt3to4: -#include -#include -#include #include #include -#include #include #include #include --- trunk/KDE/kdenetwork/kppp/modeminfo.cpp #762280:762281 @@ -46,7 +46,6 @@ { setObjectName(name); setModal(true); - setWindowFlags(Qt::WStyle_Customize|Qt::WStyle_NormalBorder); setWindowTitle(i18n("ATI Query")); KWindowSystem::setIcons(winId(), qApp->windowIcon().pixmap(IconSize(KIconLoader::Desktop),IconSize(KIconLoader::Desktop)), qApp->windowIcon().pixmap(IconSize(KIconLoader::Small),IconSize(KIconLoader::Small))); @@ -258,7 +257,6 @@ { setObjectName(name); setModal(true); - setWindowFlags(Qt::WStyle_Customize|Qt::WStyle_NormalBorder); QString label_text; setWindowTitle(i18n("Modem Query Results"));