TQt4 port basket

This enables compilation under both Qt3 and Qt4


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

1 files changed, 76 insertions, 71 deletions

diff --git a/src/settings.h b/src/settings.h
index e731262..7f66abd 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -21,29 +21,29 @@
 #ifndef SETTINGS_H
 #define SETTINGS_H
 
-#include <qstring.h>
+#include <tqstring.h>
 #include <kdialogbase.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qtooltip.h>
-#include <qcolor.h>
-#include <qpoint.h>
-#include <qsize.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqtooltip.h>
+#include <tqcolor.h>
+#include <tqpoint.h>
+#include <tqsize.h>
 #include <kcmodule.h>
 #include <kaction.h>
 #include <kmainwindow.h>
-#include <qdatetime.h>
+#include <tqdatetime.h>
 
 #include "global.h"
 #include "bnpview.h"
 #include "systemtray.h"
 
-class QGroupBox;
-class QButtonGroup;
+class TQGroupBox;
+class TQButtonGroup;
 class KColorCombo;
 class KIntNumInput;
 class KGlobalAccel;
-class QLabel;
+class TQLabel;
 
 class Container;
 class SystemTray;
@@ -56,8 +56,9 @@ class IconSizeCombo;
 class GeneralPage : public KCModule
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-	GeneralPage(QWidget * parent=0, const char * name=0);
+	GeneralPage(TQWidget * tqparent=0, const char * name=0);
 	GeneralPage() {};
 	virtual ~GeneralPage() {}
 
@@ -67,25 +68,26 @@ class GeneralPage : public KCModule
 
   private:
 	// General
-	QComboBox           *m_treeOnLeft;
-	QComboBox           *m_filterOnTop;
-	QCheckBox           *m_usePassivePopup;
+	TQComboBox           *m_treeOnLeft;
+	TQComboBox           *m_filterOnTop;
+	TQCheckBox           *m_usePassivePopup;
 
 	// System Tray Icon
-	QCheckBox           *m_useSystray;
-	QWidget             *m_systray;
-	QCheckBox           *m_showIconInSystray;
-	QCheckBox           *m_hideOnMouseOut;
+	TQCheckBox           *m_useSystray;
+	TQWidget             *m_systray;
+	TQCheckBox           *m_showIconInSystray;
+	TQCheckBox           *m_hideOnMouseOut;
 	KIntNumInput        *m_timeToHideOnMouseOut;
-	QCheckBox           *m_showOnMouseIn;
+	TQCheckBox           *m_showOnMouseIn;
 	KIntNumInput        *m_timeToShowOnMouseIn;
 };
 
 class BasketsPage : public KCModule
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-	BasketsPage(QWidget * parent=0, const char * name=0);
+	BasketsPage(TQWidget * tqparent=0, const char * name=0);
 	BasketsPage() {};
 
 	virtual void load();
@@ -94,29 +96,30 @@ class BasketsPage : public KCModule
 
   private:
 	// Appearance
-	QCheckBox           *m_playAnimations;
-	QCheckBox           *m_showNotesToolTip;
-	QCheckBox           *m_bigNotes;
+	TQCheckBox           *m_playAnimations;
+	TQCheckBox           *m_showNotesToolTip;
+	TQCheckBox           *m_bigNotes;
 
 	// Behavior
-	QCheckBox           *m_autoBullet;
-	QCheckBox           *m_confirmNoteDeletion;
-	QCheckBox           *m_exportTextTags;
-	QWidget             *m_groupOnInsertionLineWidget;
-	QCheckBox           *m_groupOnInsertionLine;
-	QComboBox           *m_middleAction;
+	TQCheckBox           *m_autoBullet;
+	TQCheckBox           *m_confirmNoteDeletion;
+	TQCheckBox           *m_exportTextTags;
+	TQWidget             *m_groupOnInsertionLineWidget;
+	TQCheckBox           *m_groupOnInsertionLine;
+	TQComboBox           *m_middleAction;
 
 	// Protection
-	QCheckBox           *m_useGnuPGAgent;
-	QCheckBox           *m_enableReLockTimeoutMinutes;
+	TQCheckBox           *m_useGnuPGAgent;
+	TQCheckBox           *m_enableReLockTimeoutMinutes;
 	KIntNumInput        *m_reLockTimeoutMinutes;
 };
 
 class NewNotesPage : public KCModule
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-	NewNotesPage(QWidget * parent=0, const char * name=0);
+	NewNotesPage(TQWidget * tqparent=0, const char * name=0);
 	NewNotesPage() {};
 
 	virtual void load();
@@ -130,21 +133,22 @@ class NewNotesPage : public KCModule
 	// Notes Image Size
 	KIntNumInput        *m_imgSizeX;
 	KIntNumInput        *m_imgSizeY;
-	QPushButton         *m_pushVisualize;
+	TQPushButton         *m_pushVisualize;
 
 	// Note Addition
-	QComboBox           *m_newNotesPlace;
-	QCheckBox           *m_viewTextFileContent;
-	QCheckBox           *m_viewHtmlFileContent;
-	QCheckBox           *m_viewImageFileContent;
-	QCheckBox           *m_viewSoundFileContent;
+	TQComboBox           *m_newNotesPlace;
+	TQCheckBox           *m_viewTextFileContent;
+	TQCheckBox           *m_viewHtmlFileContent;
+	TQCheckBox           *m_viewImageFileContent;
+	TQCheckBox           *m_viewSoundFileContent;
 };
 
 class NotesAppearancePage : public KCModule
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-	NotesAppearancePage(QWidget * parent=0, const char * name=0);
+	NotesAppearancePage(TQWidget * tqparent=0, const char * name=0);
 	NotesAppearancePage() {};
 
 	virtual void load();
@@ -163,8 +167,9 @@ class NotesAppearancePage : public KCModule
 class ApplicationsPage : public KCModule
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-	ApplicationsPage(QWidget * parent=0, const char * name=0);
+	ApplicationsPage(TQWidget * tqparent=0, const char * name=0);
 	ApplicationsPage() {};
 
 	virtual void load();
@@ -173,10 +178,10 @@ class ApplicationsPage : public KCModule
 
   private:
 	// Applications
-	QCheckBox           *m_htmlUseProg;
-	QCheckBox           *m_imageUseProg;
-	QCheckBox           *m_animationUseProg;
-	QCheckBox           *m_soundUseProg;
+	TQCheckBox           *m_htmlUseProg;
+	TQCheckBox           *m_imageUseProg;
+	TQCheckBox           *m_animationUseProg;
+	TQCheckBox           *m_soundUseProg;
 	RunCommandRequester *m_htmlProg;
 	RunCommandRequester *m_imageProg;
 	RunCommandRequester *m_animationProg;
@@ -205,10 +210,10 @@ class Settings // FIXME: Distaptch new config events ?
 	static bool    s_spellCheckTextNotes;
 	static int     s_basketTreeWidth;
 	static bool    s_welcomeBasketsAdded;
-	static QString s_dataFolder;
-	static QDate   s_lastBackup;
-	static QPoint  s_mainWindowPosition;
-	static QSize   s_mainWindowSize;
+	static TQString s_dataFolder;
+	static TQDate   s_lastBackup;
+	static TQPoint  s_mainWindowPosition;
+	static TQSize   s_mainWindowSize;
 	static bool    s_showEmptyBasketInfo;
 	static bool    s_blinkedFilter;
 	static bool    s_enableReLockTimeout;
@@ -232,10 +237,10 @@ class Settings // FIXME: Distaptch new config events ?
 	static bool    s_imageUseProg;
 	static bool    s_animationUseProg;
 	static bool    s_soundUseProg;
-	static QString s_htmlProg;
-	static QString s_imageProg;
-	static QString s_animationProg;
-	static QString s_soundProg;
+	static TQString s_htmlProg;
+	static TQString s_imageProg;
+	static TQString s_animationProg;
+	static TQString s_soundProg;
 	/** Insert Note Default Values */
 	static int     s_defImageX;
 	static int     s_defImageY;
@@ -268,20 +273,20 @@ class Settings // FIXME: Distaptch new config events ?
 	static inline int     dropTimeToShow()       { return 7;                      } // TODO: 700 ; TODO: There is certainly a KGlobalConfig ???
 	static inline bool    usePassivePopup()      { return s_usePassivePopup;      }
 	static inline bool    welcomeBasketsAdded()  { return s_welcomeBasketsAdded;  }
-	static inline QString dataFolder()           { return s_dataFolder;           }
-	static inline QDate   lastBackup()           { return s_lastBackup;           }
-	static inline QPoint  mainWindowPosition()   { return s_mainWindowPosition;   }
-	static inline QSize   mainWindowSize()       { return s_mainWindowSize;       }
+	static inline TQString dataFolder()           { return s_dataFolder;           }
+	static inline TQDate   lastBackup()           { return s_lastBackup;           }
+	static inline TQPoint  mainWindowPosition()   { return s_mainWindowPosition;   }
+	static inline TQSize   mainWindowSize()       { return s_mainWindowSize;       }
 	static inline bool    showEmptyBasketInfo()  { return s_showEmptyBasketInfo;  }
 	/** Programs */
 	static inline bool    isHtmlUseProg()        { return s_htmlUseProg;          }
 	static inline bool    isImageUseProg()       { return s_imageUseProg;         }
 	static inline bool    isAnimationUseProg()   { return s_animationUseProg;     }
 	static inline bool    isSoundUseProg()       { return s_soundUseProg;         }
-	static inline QString htmlProg()             { return s_htmlProg;             }
-	static inline QString imageProg()            { return s_imageProg;            }
-	static inline QString animationProg()        { return s_animationProg;        }
-	static inline QString soundProg()            { return s_soundProg;            }
+	static inline TQString htmlProg()             { return s_htmlProg;             }
+	static inline TQString imageProg()            { return s_imageProg;            }
+	static inline TQString animationProg()        { return s_animationProg;        }
+	static inline TQString soundProg()            { return s_soundProg;            }
 	/** Insert Note Default Values */
 	static inline int     defImageX()            { return s_defImageX;            }
 	static inline int     defImageY()            { return s_defImageY;            }
@@ -356,20 +361,20 @@ class Settings // FIXME: Distaptch new config events ?
 	static inline void setBasketTreeWidth(int width)            { s_basketTreeWidth      = width;       }
 	static inline void setUsePassivePopup(bool enable)          { s_usePassivePopup      = enable;      }
 	static inline void setWelcomeBasketsAdded(bool added)       { s_welcomeBasketsAdded  = added;       }
-	static inline void setDataFolder(const QString &folder)     { s_dataFolder           = folder;      }
-	static inline void setLastBackup(const QDate &date)         { s_lastBackup           = date;        }
-	static inline void setMainWindowPosition(const QPoint &pos) { s_mainWindowPosition   = pos;         }
-	static inline void setMainWindowSize(const QSize &size)     { s_mainWindowSize       = size;        }
+	static inline void setDataFolder(const TQString &folder)     { s_dataFolder           = folder;      }
+	static inline void setLastBackup(const TQDate &date)         { s_lastBackup           = date;        }
+	static inline void setMainWindowPosition(const TQPoint &pos) { s_mainWindowPosition   = pos;         }
+	static inline void setMainWindowSize(const TQSize &size)     { s_mainWindowSize       = size;        }
 	static inline void setShowEmptyBasketInfo(bool show)        { s_showEmptyBasketInfo  = show;        }
 	// Programs :
 	static inline void setIsHtmlUseProg(bool useProg)           { s_htmlUseProg          = useProg;     }
 	static inline void setIsImageUseProg(bool useProg)          { s_imageUseProg         = useProg;     }
 	static inline void setIsAnimationUseProg(bool useProg)      { s_animationUseProg     = useProg;     }
 	static inline void setIsSoundUseProg(bool useProg)          { s_soundUseProg         = useProg;     }
-	static inline void setHtmlProg(const QString &prog)         { s_htmlProg             = prog;        }
-	static inline void setImageProg(const QString &prog)        { s_imageProg            = prog;        }
-	static inline void setAnimationProg(const QString &prog)    { s_animationProg        = prog;        }
-	static inline void setSoundProg(const QString &prog)        { s_soundProg            = prog;        }
+	static inline void setHtmlProg(const TQString &prog)         { s_htmlProg             = prog;        }
+	static inline void setImageProg(const TQString &prog)        { s_imageProg            = prog;        }
+	static inline void setAnimationProg(const TQString &prog)    { s_animationProg        = prog;        }
+	static inline void setSoundProg(const TQString &prog)        { s_soundProg            = prog;        }
 	// Insert Note Default Values :
 	static inline void setDefImageX(int val)                    { s_defImageX            = val;         }
 	static inline void setDefImageY(int val)                    { s_defImageY            = val;         }
@@ -385,8 +390,8 @@ class Settings // FIXME: Distaptch new config events ?
 	static void loadConfig();
 	static void saveConfig();
   protected:
-	static void loadLinkLook(LinkLook *look, const QString &name, const LinkLook &defaultLook);
-	static void saveLinkLook(LinkLook *look, const QString &name);
+	static void loadLinkLook(LinkLook *look, const TQString &name, const LinkLook &defaultLook);
+	static void saveLinkLook(LinkLook *look, const TQString &name);
 };
 
 #endif // SETTINGS_H