5 files changed, 0 insertions, 65 deletions

diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index 199f87af..b6741470 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -42,15 +42,7 @@
 
 #include <tqlayout.h>
 #include <tqlabel.h>
-#ifdef COMPILE_USE_QT4
-#include <tq3header.h>
-#include <tqevent.h>
-#include <TQImageWriter>
-#include <TQImageReader>
-
-#else
 #include <tqheader.h>
-#endif
 #include "kvi_pointerhashtable.h"
 #include <tqimage.h>
 #include <tqstring.h>
@@ -740,18 +732,11 @@ void KviRegisteredUsersDialog::exportClicked()
 					if(!av->pixmap()->isNull())
 					{
 						if(!f.save(1))goto write_error;
-#ifdef COMPILE_USE_QT4
-						TQImageWriter io;
-						io.setDevice(&f);
-						io.setFormat("PNG");						
-						if(!io.write(av->pixmap()->convertToImage()))goto write_error;
-#else
 						TQImageIO io;
 						io.setImage(av->pixmap()->convertToImage());
 						io.setIODevice(TQT_TQIODEVICE(&f));
 						io.setFormat("PNG");
 						if(!io.write())goto write_error;
-#endif	
 					} else {
 						if(!f.save(0))goto write_error;
 					}
@@ -845,14 +830,6 @@ void KviRegisteredUsersDialog::importClicked()
 		{
 			// there is an avatar
 			TQImage img;
-#ifdef COMPILE_USE_QT4
-			TQImageReader io;
-			io.setDevice(&f);
-			io.setFormat("PNG");
-			img=io.read();
-//			if(io.read())goto read_error;
-
-#else
 			TQImageIO io;
 			io.setImage(img);
 			io.setIODevice(TQT_TQIODEVICE(&f));
@@ -861,7 +838,6 @@ void KviRegisteredUsersDialog::importClicked()
 			if(!io.read())goto read_error;
 
 			img = io.image();
-#endif
 			if(img.isNull())tqDebug("Ops.. readed a null image ?");
 
 			KviStr fName = u->name();
@@ -898,6 +874,3 @@ succesfull_import:
 	f.close();
 	fillList();
 }
-#if defined(COMPILE_USE_QT4) && defined(COMPILE_ON_WINDOWS) 
-#include "dialog.moc"
-#endif
diff --git a/src/modules/reguser/dialog.h b/src/modules/reguser/dialog.h
index 4dbb4c6b..88a86913 100644
--- a/src/modules/reguser/dialog.h
+++ b/src/modules/reguser/dialog.h
@@ -34,16 +34,10 @@
 #include "kvi_tal_listbox.h"
 #include "kvi_pointerhashtable.h"
 #include "kvi_tal_popupmenu.h"
-#ifdef COMPILE_USE_QT4
-	#include <tq3intdict.h>
-	#include <tq3simplerichtext.h>
-	#define TQSimpleRichText Q3SimpleRichText
-#else
 	#include <tqsimplerichtext.h>
 	#include <tqintdict.h>
 
 
-#endif
 
 class KviRegisteredUsersDialogItemBase : public KviTalListViewItem
 {
@@ -116,11 +110,7 @@ public:
 	TQPushButton * m_pImportButton;
 	TQPushButton * m_pExportButton;
 	TQPushButton * m_pAddGroupButton;
-#ifdef COMPILE_USE_QT4
-	Q3IntDict<KviRegisteredUserGroup> m_TmpDict;
-#else
 	TQIntDict<KviRegisteredUserGroup> m_TmpDict;
-#endif
 
 	protected slots:
 	void itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int c);
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index 956b277e..6a82fa7e 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -44,13 +44,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqgroupbox.h>
-#ifdef COMPILE_USE_QT4
-#include <tqevent.h>
-#include <tq3header.h>
-#include <tq3vbox.h>
-#else
 #include <tqheader.h>
-#endif
 #include "kvi_pointerhashtable.h"
 #include <tqimage.h>
 #include <tqstring.h>
@@ -88,11 +82,7 @@ KviReguserPropertiesDialog::KviReguserPropertiesDialog(TQWidget * p,KviPointerHa
 
 	TQGridLayout * g = new TQGridLayout(this,3,3,4,4);
 
-#ifdef COMPILE_USE_QT4
-	m_pTable = new Q3Table(this);
-#else
 	m_pTable = new TQTable(this);
-#endif
 	g->addMultiCellWidget(m_pTable,0,1,0,1);
 
 	m_pTable->setNumCols(2);
@@ -448,11 +438,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist
 	addTab(p2,__tr2qs("Properties"));
 
 	// Ignore TAB
-#ifdef COMPILE_USE_QT4
-	Q3VBox * vb = new Q3VBox(this);
-#else
 	TQVBox * vb = new TQVBox(this);
-#endif
 	vb->setMargin(10);
 
 	m_pIgnoreEnabled = new KviStyledCheckBox(__tr2qs("Enable ignore for this user"),vb);
diff --git a/src/modules/reguser/edituser.h b/src/modules/reguser/edituser.h
index 97396397..835f5f2d 100644
--- a/src/modules/reguser/edituser.h
+++ b/src/modules/reguser/edituser.h
@@ -35,17 +35,10 @@
 #include "kvi_tal_listbox.h"
 #include "kvi_pointerhashtable.h"
 #include <kvi_tal_tabdialog.h>
-#ifdef COMPILE_USE_QT4
-#include <tq3table.h>
-#define Kvi_Tal_Table Q3Table
-#define Kvi_Tal_TableItem Q3TableItem
-
-#else
 #include <tqtable.h>
 #define Kvi_Tal_Table TQTable
 #define Kvi_Tal_TableItem TQTableItem
 
-#endif
 #include "kvi_tal_popupmenu.h"
 
 #ifndef _EDITUSER_CPP_
@@ -62,11 +55,7 @@ public:
 	KviReguserPropertiesDialog(TQWidget *p,KviPointerHashTable<TQString,TQString> * dict);
 	~KviReguserPropertiesDialog();
 protected:
-#ifdef COMPILE_USE_QT4
-	Q3Table *m_pTable;
-#else
 	TQTable             * m_pTable;
-#endif
 	KviPointerHashTable<TQString,TQString>     * m_pPropertyDict;
 	TQPushButton        * m_pDelButton;
 	TQPushButton        * m_pAddButton;
diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp
index 32034358..e0e49a4b 100644
--- a/src/modules/reguser/wizard.cpp
+++ b/src/modules/reguser/wizard.cpp
@@ -31,9 +31,6 @@
 #include "kvi_pixmap.h"
 #include "kvi_regusersdb.h"
 #include "kvi_iconmanager.h"
-#ifdef COMPILE_USE_QT4
-#include <TQDesktopWidget>
-#endif
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>