From fef1c0b2793b7b7e2486cc086e3da68573765fd8 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sun, 18 Sep 2005 14:52:14 +0000 Subject: [PATCH] Byebye qvhbox svn path=/trunk/KDE/kdebase/workspace/; revision=461727 --- clients/b2/config/config.cpp | 5 +++-- clients/default/config/config.cpp | 3 ++- clients/default/config/config.h | 3 ++- clients/modernsystem/config/config.cpp | 5 +++-- clients/modernsystem/config/config.h | 7 ++++--- clients/quartz/config/config.cpp | 3 ++- clients/quartz/config/config.h | 5 +++-- kcmkwin/kwindecoration/kwindecoration.cpp | 5 +++-- kcmkwin/kwindecoration/kwindecoration.h | 5 +++-- kcmkwin/kwinrules/main.cpp | 16 +++++++--------- killer/killer.cpp | 4 +--- 11 files changed, 33 insertions(+), 28 deletions(-) diff --git a/clients/b2/config/config.cpp b/clients/b2/config/config.cpp index 5a71a54df1..a847871056 100644 --- a/clients/b2/config/config.cpp +++ b/clients/b2/config/config.cpp @@ -9,10 +9,11 @@ #include "config.h" #include -#include + //Added by qt3to4: #include #include +#include extern "C" @@ -37,7 +38,7 @@ B2Config::B2Config( KConfig* conf, QWidget* parent ) { KGlobal::locale()->insertCatalogue("kwin_b2_config"); b2Config = new KConfig("kwinb2rc"); - gb = new Q3VBox(parent); + gb = new KVBox(parent); cbColorBorder = new QCheckBox( i18n("Draw window frames using &titlebar colors"), gb); diff --git a/clients/default/config/config.cpp b/clients/default/config/config.cpp index f562d7eb03..e58468da8a 100644 --- a/clients/default/config/config.cpp +++ b/clients/default/config/config.cpp @@ -13,6 +13,7 @@ #include #include #include +#include extern "C" { @@ -33,7 +34,7 @@ KDEDefaultConfig::KDEDefaultConfig( KConfig* conf, QWidget* parent ) { KGlobal::locale()->insertCatalogue("kwin_clients"); highcolor = QPixmap::defaultDepth() > 8; - gb = new Q3VBox( parent ); + gb = new KVBox( parent ); gb->setSpacing( KDialog::spacingHint() ); cbShowStipple = new QCheckBox( i18n("Draw titlebar &stipple effect"), gb ); diff --git a/clients/default/config/config.h b/clients/default/config/config.h index 68991e26f7..d105f19171 100644 --- a/clients/default/config/config.h +++ b/clients/default/config/config.h @@ -15,6 +15,7 @@ #include #include #include +#include class KDEDefaultConfig: public QObject { @@ -40,7 +41,7 @@ class KDEDefaultConfig: public QObject QCheckBox* cbShowStipple; QCheckBox* cbShowGrabBar; QCheckBox* cbUseGradients; - Q3VBox* gb; + KVBox* gb; bool highcolor; }; diff --git a/clients/modernsystem/config/config.cpp b/clients/modernsystem/config/config.cpp index e66cb7ccd2..71c0ba1897 100644 --- a/clients/modernsystem/config/config.cpp +++ b/clients/modernsystem/config/config.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include "config.h" @@ -50,7 +51,7 @@ ModernSysConfig::ModernSysConfig(KConfig* conf, QWidget* parent) : QObject(paren layout->addMultiCellWidget(cbShowHandle, 0, 0, 0, 1); connect(cbShowHandle, SIGNAL(clicked()), this, SLOT(slotSelectionChanged())); - sliderBox = new Q3VBox(handleBox); + sliderBox = new KVBox(handleBox); handleSizeSlider = new QSlider(0, 4, 1, 0, Qt::Horizontal, sliderBox); handleSizeSlider->setWhatsThis( i18n("Here you can change the size of the resize handle.")); @@ -58,7 +59,7 @@ ModernSysConfig::ModernSysConfig(KConfig* conf, QWidget* parent) : QObject(paren handleSizeSlider->setTickmarks(QSlider::Below); connect(handleSizeSlider, SIGNAL(valueChanged(int)), this, SLOT(slotSelectionChanged())); - hbox = new Q3HBox(sliderBox); + hbox = new KHBox(sliderBox); hbox->setSpacing(6); bool rtl = kapp->reverseLayout(); diff --git a/clients/modernsystem/config/config.h b/clients/modernsystem/config/config.h index 6ae0567187..9b99fd0525 100644 --- a/clients/modernsystem/config/config.h +++ b/clients/modernsystem/config/config.h @@ -4,11 +4,12 @@ #include #include #include -#include + #include #include //Added by qt3to4: #include +#include class ModernSysConfig : public QObject { @@ -36,9 +37,9 @@ class ModernSysConfig : public QObject QVBoxLayout *vbox; QWidget *handleBox; QCheckBox *cbShowHandle; - Q3VBox *sliderBox; + KVBox *sliderBox; QSlider *handleSizeSlider; - Q3HBox *hbox; + KHBox *hbox; QLabel *label1; QLabel *label2; QLabel *label3; diff --git a/clients/quartz/config/config.cpp b/clients/quartz/config/config.cpp index 04d2230b3c..784653d7e8 100644 --- a/clients/quartz/config/config.cpp +++ b/clients/quartz/config/config.cpp @@ -11,6 +11,7 @@ #include #include +#include extern "C" @@ -35,7 +36,7 @@ QuartzConfig::QuartzConfig( KConfig* conf, QWidget* parent ) { quartzConfig = new KConfig("kwinquartzrc"); KGlobal::locale()->insertCatalogue("kwin_clients"); - gb = new Q3VBox( parent ); + gb = new KVBox( parent ); cbColorBorder = new QCheckBox( i18n("Draw window frames using &titlebar colors"), gb ); cbColorBorder->setWhatsThis( diff --git a/clients/quartz/config/config.h b/clients/quartz/config/config.h index 426e3b806e..fc5f83a062 100644 --- a/clients/quartz/config/config.h +++ b/clients/quartz/config/config.h @@ -11,8 +11,9 @@ #define __KDE_QUARTZCONFIG_H #include -#include + #include +#include class QuartzConfig: public QObject { @@ -38,7 +39,7 @@ class QuartzConfig: public QObject KConfig* quartzConfig; QCheckBox* cbColorBorder; QCheckBox* cbExtraSmall; - Q3VBox* gb; + KVBox* gb; }; diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp index 73551442f1..30ca46c939 100644 --- a/kcmkwin/kwindecoration/kwindecoration.cpp +++ b/kcmkwin/kwindecoration/kwindecoration.cpp @@ -35,7 +35,7 @@ #include #include #include -#include + #include #include #include @@ -60,6 +60,7 @@ #include "preview.h" #include #include +#include // KCModule plugin interface // ========================= @@ -117,7 +118,7 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const char* name, co borderSizeLayout->addWidget(cBorder); borderSizeLayout->addStretch(); - pluginConfigWidget = new Q3VBox(pluginSettingsGrp); + pluginConfigWidget = new KVBox(pluginSettingsGrp); pluginSettingsGrp->layout()->add( pluginConfigWidget ); // Page 2 (Button Selector) diff --git a/kcmkwin/kwindecoration/kwindecoration.h b/kcmkwin/kwindecoration/kwindecoration.h index 818fae9771..9847eed9d8 100644 --- a/kcmkwin/kwindecoration/kwindecoration.h +++ b/kcmkwin/kwindecoration/kwindecoration.h @@ -41,12 +41,13 @@ #include "kwindecorationIface.h" //Added by qt3to4: #include +#include class KComboBox; class QCheckBox; class QLabel; class QTabWidget; -class Q3VBox; +class KVBox; class QSlider; class KDecorationPlugins; @@ -128,7 +129,7 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface // Page 2 ButtonPositionWidget *buttonPositionWidget; - Q3VBox* buttonPage; + KVBox* buttonPage; }; diff --git a/kcmkwin/kwinrules/main.cpp b/kcmkwin/kwinrules/main.cpp index 41b1dbfe42..64500c2d0d 100644 --- a/kcmkwin/kwinrules/main.cpp +++ b/kcmkwin/kwinrules/main.cpp @@ -28,14 +28,12 @@ #include "ruleswidget.h" #include "../../rules.h" -//Added by qt3to4: -#include #include namespace KWinInternal { -static void loadRules( Q3ValueList< Rules* >& rules ) +static void loadRules( QList< Rules* >& rules ) { KConfig cfg( "kwinrulesrc", true ); cfg.setGroup( "General" ); @@ -50,13 +48,13 @@ static void loadRules( Q3ValueList< Rules* >& rules ) } } -static void saveRules( const Q3ValueList< Rules* >& rules ) +static void saveRules( const QList< Rules* >& rules ) { KConfig cfg( "kwinrulesrc" ); cfg.setGroup( "General" ); cfg.writeEntry( "count", rules.count()); int i = 1; - for( Q3ValueList< Rules* >::ConstIterator it = rules.begin(); + for( QList< Rules* >::ConstIterator it = rules.begin(); it != rules.end(); ++it ) { @@ -66,7 +64,7 @@ static void saveRules( const Q3ValueList< Rules* >& rules ) } } -static Rules* findRule( const Q3ValueList< Rules* >& rules, Window wid, bool whole_app ) +static Rules* findRule( const QList< Rules* >& rules, Window wid, bool whole_app ) { KWin::WindowInfo info = KWin::windowInfo( wid, NET::WMName | NET::WMWindowType, @@ -84,7 +82,7 @@ static Rules* findRule( const Q3ValueList< Rules* >& rules, Window wid, bool who Q3CString machine = info.clientMachine().lower(); Rules* best_match = NULL; int match_quality = 0; - for( Q3ValueList< Rules* >::ConstIterator it = rules.begin(); + for( QList< Rules* >::ConstIterator it = rules.begin(); it != rules.end(); ++it ) { @@ -231,7 +229,7 @@ static Rules* findRule( const Q3ValueList< Rules* >& rules, Window wid, bool who static int edit( Window wid, bool whole_app ) { - Q3ValueList< Rules* > rules; + QList< Rules* > rules; loadRules( rules ); Rules* orig_rule = findRule( rules, wid, whole_app ); RulesDialog dlg; @@ -246,7 +244,7 @@ static int edit( Window wid, bool whole_app ) } else if( edited_rule != orig_rule ) { - Q3ValueList< Rules* >::Iterator pos = rules.find( orig_rule ); + QList< Rules* >::Iterator pos = rules.find( orig_rule ); if( pos != rules.end()) *pos = edited_rule; else diff --git a/killer/killer.cpp b/killer/killer.cpp index e5c6a878c1..f39c4355db 100644 --- a/killer/killer.cpp +++ b/killer/killer.cpp @@ -30,8 +30,6 @@ DEALINGS IN THE SOFTWARE. #include #include #include -//Added by qt3to4: -#include #include static const KCmdLineOptions options[] = @@ -54,7 +52,7 @@ int main( int argc, char* argv[] ) KCmdLineArgs::addCmdLineOptions( options ); KApplication app; KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); - Q3CString hostname = args->getOption( "hostname" ); + QByteArray hostname = args->getOption( "hostname" ); bool pid_ok = false; pid_t pid = QString( args->getOption( "pid" ) ).toULong( &pid_ok ); QString caption = QString::fromUtf8( args->getOption( "windowname" ));