TQt4 port kvirc

This enables compilation under both Qt3 and Qt4


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

1 files changed, 75 insertions, 74 deletions

diff --git a/src/kvirc/ui/kvi_optionswidget.h b/src/kvirc/ui/kvi_optionswidget.h
index 8466093..463cc82 100644
--- a/src/kvirc/ui/kvi_optionswidget.h
+++ b/src/kvirc/ui/kvi_optionswidget.h
@@ -27,122 +27,123 @@
 
 #include "kvi_settings.h"
 
-#include <qframe.h>
-#include <qlayout.h>
+#include <tqframe.h>
+#include <tqlayout.h>
 #include "kvi_pointerlist.h"
-#include <qlineedit.h>
+#include <tqlineedit.h>
 #include <kvi_tal_groupbox.h>
-#include <qtabwidget.h>
+#include <tqtabwidget.h>
 #include "kvi_tal_groupbox.h"
 #include "kvi_selectors.h"
 
-class KVIRC_API KviOptionsWidget : public QFrame, public KviSelectorInterface
+class KVIRC_API KviOptionsWidget : public TQFrame, public KviSelectorInterface
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviOptionsWidget(QWidget * parent,const char * name = 0,bool bSunken = true);
+	KviOptionsWidget(TQWidget * tqparent,const char * name = 0,bool bSunken = true);
 	~KviOptionsWidget();
 private:
-	QGridLayout                      * m_pLayout;
-	QTabWidget                       * m_pTabWidget;
+	TQGridLayout                      * m_pLayout;
+	TQTabWidget                       * m_pTabWidget;
 	int                                m_iResetFlags;
 	int                                m_iSelectors;
 	KviPointerList<KviSelectorInterface> * m_pSelectorInterfaceList;
-	static QString                     m_szBasicTipStart;
-	static QString                     m_szBasicTipEnd;
+	static TQString                     m_szBasicTipStart;
+	static TQString                     m_szBasicTipEnd;
 public:
 	void mergeResetFlag(int flag){ m_iResetFlags |= flag; };
 	void createLayout(int rows,int columns);
-	QGridLayout * layout(){ return m_pLayout; };
+	TQGridLayout * tqlayout(){ return m_pLayout; };
 protected:
 	void commitSelectors();
 	void commitOptionsReset();
 public:
-	void mergeTip(QWidget * w,const QString &tip);
+	void mergeTip(TQWidget * w,const TQString &tip);
 
 	// tabbed page paradigm
 	void createTabbedPage();
-	void addOptionsWidget(const QString &szText,const QIconSet &iconSet,KviOptionsWidget * pWidget);
-	QTabWidget * tabWidget(){ return m_pTabWidget; };
+	void addOptionsWidget(const TQString &szText,const TQIconSet &iconSet,KviOptionsWidget * pWidget);
+	TQTabWidget * tabWidget(){ return m_pTabWidget; };
 
 	// non tabbed page paradigm
-	KviBoolSelector       * addBoolSelector(int x1,int y1,int x2,int y2,const QString & txt,bool * pOption,bool bEnabled = true);
-	KviBoolSelector       * addBoolSelector(QWidget * pParent,const QString & txt,bool * pOption,bool bEnabled = true);
-	KviBoolSelector       * addBoolSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true);
-	KviBoolSelector       * addBoolSelector(QWidget * pParnt,const QString & txt,int optId,bool bEnabled = true);
-
-	KviColorSelector      * addColorSelector(int x1,int y1,int x2,int y2,const QString & txt,QColor * pOption,bool bEnabled = true);
-	KviColorSelector      * addColorSelector(QWidget * pParent,const QString & txt,QColor * pOption,bool bEnabled = true);
-	KviColorSelector      * addColorSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true);
-	KviColorSelector      * addColorSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled = true);
-
-	KviMircTextColorSelector * addMircTextColorSelector(int x1,int y1,int x2,int y2,const QString & txt,unsigned int *uFore,unsigned int *uBack,bool bEnabled = true);
-	KviMircTextColorSelector * addMircTextColorSelector(QWidget * pParent,const QString & txt,unsigned int *uFore,unsigned int *uBack,bool bEnabled = true);
-	KviMircTextColorSelector * addMircTextColorSelector(int x1,int y1,int x2,int y2,const QString & txt,int optForeId,int optBackId,bool bEnabled = true);
-	KviMircTextColorSelector * addMircTextColorSelector(QWidget * pParent,const QString & txt,int optForeId,int optBackId,bool bEnabled = true);
-
-	KviDirectorySelector  * addDirectorySelector(int x1,int y1,int x2,int y2,const QString & txt,QString * pOption,bool bEnabled = true);
-	KviDirectorySelector  * addDirectorySelector(QWidget * pParent,const QString & txt,QString * pOption,bool bEnabled = true);
-	KviDirectorySelector  * addDirectorySelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true);
-	KviDirectorySelector  * addDirectorySelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled = true);
-
-	KviFileSelector       * addFileSelector(int x1,int y1,int x2,int y2,const QString & txt,QString * pOption,bool bEnabled = true);
-	KviFileSelector       * addFileSelector(QWidget * pParent,const QString & txt,QString * pOption,bool bEnabled = true);
-	KviFileSelector       * addFileSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true);
-	KviFileSelector       * addFileSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled = true);
-
-	KviSoundSelector       * addSoundSelector(int x1,int y1,int x2,int y2,const QString & txt,QString * pOption,bool bEnabled = true);
-	KviSoundSelector       * addSoundSelector(QWidget * pParent,const QString & txt,QString * pOption,bool bEnabled = true);
-	KviSoundSelector       * addSoundSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true);
-	KviSoundSelector       * addSoundSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled = true);
-
-
-	KviFontSelector       * addFontSelector(int x1,int y1,int x2,int y2,const QString & txt,QFont * pOption,bool bEnabled = true);
-	KviFontSelector       * addFontSelector(QWidget * pParent,const QString & txt,QFont * pOption,bool bEnabled = true);
-	KviFontSelector       * addFontSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true);
-	KviFontSelector       * addFontSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled = true);
-
-	KviPasswordSelector   * addPasswordSelector(int x1,int y1,int x2,int y2,const QString & txt,QString * pOption,bool bEnabled = true);
-	KviPasswordSelector   * addPasswordSelector(QWidget * pParent,const QString & txt,QString * pOption,bool bEnabled = true);
-	KviPasswordSelector   * addPasswordSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true);
-	KviPasswordSelector   * addPasswordSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled = true);
+	KviBoolSelector       * addBoolSelector(int x1,int y1,int x2,int y2,const TQString & txt,bool * pOption,bool bEnabled = true);
+	KviBoolSelector       * addBoolSelector(TQWidget * pParent,const TQString & txt,bool * pOption,bool bEnabled = true);
+	KviBoolSelector       * addBoolSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true);
+	KviBoolSelector       * addBoolSelector(TQWidget * pParnt,const TQString & txt,int optId,bool bEnabled = true);
+
+	KviColorSelector      * addColorSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQColor * pOption,bool bEnabled = true);
+	KviColorSelector      * addColorSelector(TQWidget * pParent,const TQString & txt,TQColor * pOption,bool bEnabled = true);
+	KviColorSelector      * addColorSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true);
+	KviColorSelector      * addColorSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled = true);
+
+	KviMircTextColorSelector * addMircTextColorSelector(int x1,int y1,int x2,int y2,const TQString & txt,unsigned int *uFore,unsigned int *uBack,bool bEnabled = true);
+	KviMircTextColorSelector * addMircTextColorSelector(TQWidget * pParent,const TQString & txt,unsigned int *uFore,unsigned int *uBack,bool bEnabled = true);
+	KviMircTextColorSelector * addMircTextColorSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optForeId,int optBackId,bool bEnabled = true);
+	KviMircTextColorSelector * addMircTextColorSelector(TQWidget * pParent,const TQString & txt,int optForeId,int optBackId,bool bEnabled = true);
+
+	KviDirectorySelector  * addDirectorySelector(int x1,int y1,int x2,int y2,const TQString & txt,TQString * pOption,bool bEnabled = true);
+	KviDirectorySelector  * addDirectorySelector(TQWidget * pParent,const TQString & txt,TQString * pOption,bool bEnabled = true);
+	KviDirectorySelector  * addDirectorySelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true);
+	KviDirectorySelector  * addDirectorySelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled = true);
+
+	KviFileSelector       * addFileSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQString * pOption,bool bEnabled = true);
+	KviFileSelector       * addFileSelector(TQWidget * pParent,const TQString & txt,TQString * pOption,bool bEnabled = true);
+	KviFileSelector       * addFileSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true);
+	KviFileSelector       * addFileSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled = true);
+
+	KviSoundSelector       * addSoundSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQString * pOption,bool bEnabled = true);
+	KviSoundSelector       * addSoundSelector(TQWidget * pParent,const TQString & txt,TQString * pOption,bool bEnabled = true);
+	KviSoundSelector       * addSoundSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true);
+	KviSoundSelector       * addSoundSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled = true);
+
+
+	KviFontSelector       * addFontSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQFont * pOption,bool bEnabled = true);
+	KviFontSelector       * addFontSelector(TQWidget * pParent,const TQString & txt,TQFont * pOption,bool bEnabled = true);
+	KviFontSelector       * addFontSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true);
+	KviFontSelector       * addFontSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled = true);
+
+	KviPasswordSelector   * addPasswordSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQString * pOption,bool bEnabled = true);
+	KviPasswordSelector   * addPasswordSelector(TQWidget * pParent,const TQString & txt,TQString * pOption,bool bEnabled = true);
+	KviPasswordSelector   * addPasswordSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true);
+	KviPasswordSelector   * addPasswordSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled = true);
 	
-	KviPixmapSelector     * addPixmapSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true);
-	KviPixmapSelector     * addPixmapSelector(int x1,int y1,int x2,int y2,const QString & txt,KviPixmap * pOption,bool bEnabled = true);
+	KviPixmapSelector     * addPixmapSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true);
+	KviPixmapSelector     * addPixmapSelector(int x1,int y1,int x2,int y2,const TQString & txt,KviPixmap * pOption,bool bEnabled = true);
 
-	KviStringListSelector * addStringListSelector(int x1,int y1,int x2,int y2,const QString & txt,QStringList * pOption,bool bEnabled = true);
-	KviStringListSelector * addStringListSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true);
+	KviStringListSelector * addStringListSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQStringList * pOption,bool bEnabled = true);
+	KviStringListSelector * addStringListSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true);
 
-	KviStringSelector     * addStringSelector(int x1,int y1,int x2,int y2,const QString & txt,QString * pOption,bool bEnabled = true);
-	KviStringSelector     * addStringSelector(QWidget * pParent,const QString & txt,QString * pOption,bool bEnabled = true);
-	KviStringSelector     * addStringSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true);
-	KviStringSelector     * addStringSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled = true);
+	KviStringSelector     * addStringSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQString * pOption,bool bEnabled = true);
+	KviStringSelector     * addStringSelector(TQWidget * pParent,const TQString & txt,TQString * pOption,bool bEnabled = true);
+	KviStringSelector     * addStringSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true);
+	KviStringSelector     * addStringSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled = true);
 
-	KviUIntSelector       * addUIntSelector(int x1,int y1,int x2,int y2,const QString & txt,unsigned int * pOption,
+	KviUIntSelector       * addUIntSelector(int x1,int y1,int x2,int y2,const TQString & txt,unsigned int * pOption,
 								unsigned int uLowBound,unsigned int uHighBound,unsigned int uDefault,bool bEnabled = true);
-	KviUIntSelector       * addUIntSelector(QWidget * pParent,const QString & txt,unsigned int * pOption,
+	KviUIntSelector       * addUIntSelector(TQWidget * pParent,const TQString & txt,unsigned int * pOption,
 								unsigned int uLowBound,unsigned int uHighBound,unsigned int uDefault,bool bEnabled = true);
-	KviUIntSelector       * addUIntSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,
+	KviUIntSelector       * addUIntSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,
 				unsigned int uLowBound,unsigned int uHighBound,unsigned int uDefault,bool bEnabled = true);
-	KviUIntSelector       * addUIntSelector(QWidget * pParent,const QString & txt,int optId,
+	KviUIntSelector       * addUIntSelector(TQWidget * pParent,const TQString & txt,int optId,
 				unsigned int uLowBound,unsigned int uHighBound,unsigned int uDefault,bool bEnabled = true);
 
 
-	KviUIntSelector       * addUShortIntSelector(int x1,int y1,int x2,int y2,const QString & txt,unsigned short int * pOption,
+	KviUIntSelector       * addUShortIntSelector(int x1,int y1,int x2,int y2,const TQString & txt,unsigned short int * pOption,
 							unsigned int uLowBound,unsigned int uHighBound,unsigned int uDefault,bool bEnabled = true);
 
-	QLabel * addLabel(int x1,int y1,int x2,int y2,const QString & text,bool bEnabled = true);
-	QLabel * addLabel(QWidget * pParent,const QString & text,bool bEnabled = true);
-	QLineEdit * addLineEdit(int x1,int y1,int x2,int y2,bool bEnabled = true);
+	TQLabel * addLabel(int x1,int y1,int x2,int y2,const TQString & text,bool bEnabled = true);
+	TQLabel * addLabel(TQWidget * pParent,const TQString & text,bool bEnabled = true);
+	TQLineEdit * addLineEdit(int x1,int y1,int x2,int y2,bool bEnabled = true);
 #ifdef COMPILE_USE_QT4
-	KviTalGroupBox * addGroupBox(int x1,int y1,int x2,int y2,int nStrips,Qt::Orientation o,const QString &txt,bool bEnabled = true);
+	KviTalGroupBox * addGroupBox(int x1,int y1,int x2,int y2,int nStrips,Qt::Orientation o,const TQString &txt,bool bEnabled = true);
 #else
-	KviTalGroupBox * addGroupBox(int x1,int y1,int x2,int y2,int nStrips,KviTalGroupBox::Orientation o,const QString &txt,bool bEnabled = true);
+	KviTalGroupBox * addGroupBox(int x1,int y1,int x2,int y2,int nStrips,KviTalGroupBox::Orientation o,const TQString &txt,bool bEnabled = true);
 #endif
-	QFrame * addSeparator(int x1,int y1,int x2,int y2);
+	TQFrame * addSeparator(int x1,int y1,int x2,int y2);
 	void addRowSpacer(int x1,int y1,int x2,int y2);
 
-	void addWidgetToLayout(QWidget * w,int x1,int y1,int x2,int y2);
+	void addWidgetToLayout(TQWidget * w,int x1,int y1,int x2,int y2);
 
 	// this does NOT add the advanced button if this page is not inside a KviGeneralOptionsDialog
 	// this is because nobody listens to the "switchToAdvancedPage" requests....