TQt4 port kdeartwork

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeartwork@1246991 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

3 files changed, 11 insertions, 10 deletions

diff --git a/kwin-styles/glow/config/Makefile.am b/kwin-styles/glow/config/Makefile.am
index e677ff91..c1721d1e 100644
--- a/kwin-styles/glow/config/Makefile.am
+++ b/kwin-styles/glow/config/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = $(all_includes)
 kde_module_LTLIBRARIES = kwin_glow_config.la
 
 kwin_glow_config_la_SOURCES = glowconfigdialog.cpp
-kwin_glow_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+kwin_glow_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx
 kwin_glow_config_la_LIBADD = $(LIB_KDEUI)
 
 METASOURCES = AUTO
diff --git a/kwin-styles/glow/config/glowconfigdialog.cpp b/kwin-styles/glow/config/glowconfigdialog.cpp
index ab0cd40d..5d3b4487 100644
--- a/kwin-styles/glow/config/glowconfigdialog.cpp
+++ b/kwin-styles/glow/config/glowconfigdialog.cpp
@@ -59,7 +59,7 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent )
 
 	_main_group_box = new TQWidget(parent);
 	TQVBoxLayout *main_group_boxLayout = new TQVBoxLayout(_main_group_box);
-	main_group_boxLayout->setAlignment(Qt::AlignTop | Qt::AlignLeft);
+	main_group_boxLayout->tqsetAlignment(TQt::AlignTop | TQt::AlignLeft);
 	main_group_boxLayout->setSpacing(6);
 
 	//-------------------------------------------------------------------------
@@ -79,12 +79,12 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent )
 	_button_glow_color_group_box = new TQGroupBox(
 		0, Qt::Horizontal, i18n("Button Glow Colors"), _main_group_box);
 	TQHBoxLayout *colorHBoxLayout =
-		new TQHBoxLayout(_button_glow_color_group_box->layout());
+		new TQHBoxLayout(_button_glow_color_group_box->tqlayout());
 
 	// create buttons
 	TQSize buttonSize(BITMAP_SIZE, BITMAP_SIZE);
 	TQPixmap pm(buttonSize);
-	pm.fill(Qt::black);
+	pm.fill(TQt::black);
 
 	_stickyButton = new TQPushButton(_button_glow_color_group_box);
 	pm.setMask(TQBitmap(buttonSize, stickyoff_bits, true));
@@ -119,7 +119,7 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent )
 	// create signal mapper
 	_titleButtonMapper = new TQSignalMapper(this);
 	for( uint i=0; i<_titleButtonList.size(); i++ ) {
-		_titleButtonMapper->setMapping(_titleButtonList[i], i);
+		_titleButtonMapper->setMapping(TQT_TQOBJECT(_titleButtonList[i]), i);
 		connect(_titleButtonList[i], TQT_SIGNAL(clicked()),_titleButtonMapper, TQT_SLOT(map()));
 	}
 	connect(_titleButtonMapper, TQT_SIGNAL(mapped(int)),this, TQT_SLOT(slotTitleButtonClicked(int)));
@@ -139,7 +139,7 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent )
 	_titlebarGradientTypeComboBox = new TQComboBox(_main_group_box);
 
     KConfig *c = KGlobal::config();
-    KConfigGroupSaver cgs( c, TQString::fromLatin1("WM") );
+    KConfigGroupSaver cgs( c, TQString::tqfromLatin1("WM") );
     TQColor activeBackground = c->readColorEntry("activeBackground");
     TQColor activeBlend = c->readColorEntry("activeBlend");
 
@@ -159,7 +159,7 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent )
 		this, TQT_SLOT(slotTitlebarGradientTypeChanged(int)));
 	titlebarGradientTypeLayout->addWidget(
 		new TQLabel(i18n("Titlebar gradient:"), _main_group_box));
-	titlebarGradientTypeLayout->addWidget(_titlebarGradientTypeComboBox, 0, Qt::AlignLeft);
+	titlebarGradientTypeLayout->addWidget(_titlebarGradientTypeComboBox, 0, TQt::AlignLeft);
         titlebarGradientTypeLayout->addStretch(10);
 	main_group_boxLayout->addLayout(titlebarGradientTypeLayout);
 
@@ -194,7 +194,7 @@ void GlowConfigDialog::load( KConfig* /* conf */ )
 
 	_glowConfig->setGroup("General");
 
-	_buttonConfigMap = new QColor[NUMBER_OF_BUTTONS];
+	_buttonConfigMap = new TQColor[NUMBER_OF_BUTTONS];
 	color = _glowConfig->readColorEntry("stickyButtonGlowColor",
 			&defaultStickyButtonColor);
 	_buttonConfigMap[stickyButton] = color;
@@ -286,7 +286,7 @@ void GlowConfigDialog::slotLoadThemeList ()
 				TQDir::Dirs | TQDir::Readable);
 		if (dir.exists())
 		{
-			QFileInfoListIterator it2(*dir.entryInfoList());
+			TQFileInfoListIterator it2(*dir.entryInfoList());
 			TQFileInfo * finfo;
 
 			while ((finfo=it2.current()))
diff --git a/kwin-styles/glow/config/glowconfigdialog.h b/kwin-styles/glow/config/glowconfigdialog.h
index e8a1be31..81747a4c 100644
--- a/kwin-styles/glow/config/glowconfigdialog.h
+++ b/kwin-styles/glow/config/glowconfigdialog.h
@@ -29,9 +29,10 @@ class TQComboBox;
 class KConfig;
 class KColorButton;
 
-class GlowConfigDialog : public QObject
+class GlowConfigDialog : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	GlowConfigDialog( KConfig* conf, TQWidget* parent );