yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Byebye qvhbox

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=461727
This commit is contained in:
Laurent Montel 2005-09-18 14:52:14 +00:00
parent db7d074ad1
commit fef1c0b279
11 changed files with 33 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
clients/b2/config/config.cpp
View file

@ -9,10 +9,11 @@
#include "config.h"
#include <kglobal.h>
#include <q3vbox.h>
//Added by qt3to4:
#include <QLabel>
#include <klocale.h>
#include <kvbox.h>
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);

3
clients/default/config/config.cpp
View file

@ -13,6 +13,7 @@
#include <kdialog.h>
#include <klocale.h>
#include <qpixmap.h>
#include <kvbox.h>
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 );

3
clients/default/config/config.h
View file

@ -15,6 +15,7 @@
#include <kconfig.h>
#include <qlabel.h>
#include <Qt3Support/q3vbox.h>
#include <kvbox.h>
class KDEDefaultConfig: public QObject
{
@ -40,7 +41,7 @@ class KDEDefaultConfig: public QObject
QCheckBox* cbShowStipple;
QCheckBox* cbShowGrabBar;
QCheckBox* cbUseGradients;
Q3VBox* gb;
KVBox* gb;
bool highcolor;
};

5
clients/modernsystem/config/config.cpp
View file

@ -11,6 +11,7 @@
#include <QLabel>
#include <QVBoxLayout>
#include <QGridLayout>
#include <kvbox.h>
#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();

7
clients/modernsystem/config/config.h
View file

@ -4,11 +4,12 @@
#include <qcheckbox.h>
#include <q3groupbox.h>
#include <qlayout.h>
#include <q3vbox.h>
#include <qslider.h>
#include <qlabel.h>
//Added by qt3to4:
#include <QVBoxLayout>
#include <kvbox.h>
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;

3
clients/quartz/config/config.cpp
View file

@ -11,6 +11,7 @@
#include <kglobal.h>
#include <klocale.h>
#include <kvbox.h>
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(

5
clients/quartz/config/config.h
View file

@ -11,8 +11,9 @@
#define __KDE_QUARTZCONFIG_H
#include <qcheckbox.h>
#include <q3vbox.h>
#include <kconfig.h>
#include <kvbox.h>
class QuartzConfig: public QObject
{
@ -38,7 +39,7 @@ class QuartzConfig: public QObject
KConfig* quartzConfig;
QCheckBox* cbColorBorder;
QCheckBox* cbExtraSmall;
Q3VBox* gb;
KVBox* gb;
};

5
kcmkwin/kwindecoration/kwindecoration.cpp
View file

@ -35,7 +35,7 @@
#include <q3groupbox.h>
#include <qcheckbox.h>
#include <qtabwidget.h>
#include <q3vbox.h>
#include <qlabel.h>
#include <qfile.h>
#include <qslider.h>
@ -60,6 +60,7 @@
#include "preview.h"
#include <kdecoration_plugins_p.h>
#include <kdecorationfactory.h>
#include <kvbox.h>
// 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)

5
kcmkwin/kwindecoration/kwindecoration.h
View file

@ -41,12 +41,13 @@
#include "kwindecorationIface.h"
//Added by qt3to4:
#include <QLabel>
#include <kvbox.h>
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;
};

16
kcmkwin/kwinrules/main.cpp
View file

@ -28,14 +28,12 @@
#include "ruleswidget.h"
#include "../../rules.h"
//Added by qt3to4:
#include <Q3ValueList>
#include <Q3CString>
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

4
killer/killer.cpp
View file

@ -30,8 +30,6 @@ DEALINGS IN THE SOFTWARE.
#include <unistd.h>
#include <kwin.h>
#include <X11/Xlib.h>
//Added by qt3to4:
#include <Q3CString>
#include <QX11Info>
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" ));