TQt4 port yakuake

This enables compilation under both Qt3 and Qt4


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

1 files changed, 37 insertions, 36 deletions

diff --git a/yakuake/src/main_window.h b/yakuake/src/main_window.h
index edc9eeb..225fc0e 100644
--- a/yakuake/src/main_window.h
+++ b/yakuake/src/main_window.h
@@ -20,13 +20,13 @@
 #include "dcop_interface.h"
 #include "session.h"
 
-#include <qmap.h>
-#include <qcolor.h>
-#include <qtimer.h>
-#include <qlayout.h>
-#include <qwidget.h>
-#include <qapplication.h>
-#include <qwidgetstack.h>
+#include <tqmap.h>
+#include <tqcolor.h>
+#include <tqtimer.h>
+#include <tqlayout.h>
+#include <tqwidget.h>
+#include <tqapplication.h>
+#include <tqwidgetstack.h>
 
 #include <kwin.h>
 #include <kaction.h>
@@ -51,23 +51,24 @@ class KAboutKDE;
 class MainWindow : public KMainWindow, virtual public DCOPInterface
 {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
-        explicit MainWindow(QWidget* parent = 0, const char* name = 0);
+        explicit MainWindow(TQWidget* tqparent = 0, const char* name = 0);
         ~MainWindow();
 
         int selectedSession();
         int selectedTerminal();
 
-        const QString sessionIdList();
-        const QString terminalIdList(int session_id);
+        const TQString sessionIdList();
+        const TQString terminalIdList(int session_id);
 
         int tabPositionForSessionId(int session_id);
         int sessionIdForTabPosition(int position);
 
         void updateWindowMask();
 
-        void showPopup(const QString & text, int time = 5000);
+        void showPopup(const TQString & text, int time = 5000);
 
 
     public slots:
@@ -91,19 +92,19 @@ class MainWindow : public KMainWindow, virtual public DCOPInterface
         void slotSelectSession(int session_id);
         void slotSelectTabPosition(int position);
 
-        void slotRenameSession(int session_id, const QString& name);
+        void slotRenameSession(int session_id, const TQString& name);
         void slotInteractiveRename();
 
-        const QString slotSessionName();
-        const QString slotSessionName(int session_id);
+        const TQString slotSessionName();
+        const TQString slotSessionName(int session_id);
 
-        const QString slotSessionTitle();
-        const QString slotSessionTitle(int session_id);
-        const QString slotSessionTitle(int session_id, int terminal_id);
+        const TQString slotSessionTitle();
+        const TQString slotSessionTitle(int session_id);
+        const TQString slotSessionTitle(int session_id, int terminal_id);
 
-        void slotSetSessionTitleText(const QString& title);
-        void slotSetSessionTitleText(int session_id, const QString& title);
-        void slotSetSessionTitleText(int session_id, int terminal_id, const QString& title);
+        void slotSetSessionTitleText(const TQString& title);
+        void slotSetSessionTitleText(int session_id, const TQString& title);
+        void slotSetSessionTitleText(int session_id, int terminal_id, const TQString& title);
 
         void slotPasteClipboard();
         void slotPasteClipboard(int session_id);
@@ -113,9 +114,9 @@ class MainWindow : public KMainWindow, virtual public DCOPInterface
         void slotPasteSelection(int session_id);
         void slotPasteSelection(int session_id, int terminal_id);
 
-        void slotRunCommandInSession(const QString& command);
-        void slotRunCommandInSession(int session_id, const QString& command);
-        void slotRunCommandInSession(int session_id, int terminal_id, const QString& command);
+        void slotRunCommandInSession(const TQString& command);
+        void slotRunCommandInSession(int session_id, const TQString& command);
+        void slotRunCommandInSession(int session_id, int terminal_id, const TQString& command);
 
         void slotSplitHorizontally();
         void slotSplitHorizontally(int session_id);
@@ -137,7 +138,7 @@ class MainWindow : public KMainWindow, virtual public DCOPInterface
 
     protected:
         virtual void windowActivationChange(bool old_active);
-        virtual void moveEvent(QMoveEvent* e);
+        virtual void moveEvent(TQMoveEvent* e);
         bool queryClose();
 
 
@@ -154,7 +155,7 @@ class MainWindow : public KMainWindow, virtual public DCOPInterface
         void initWindowProps();
 
         int getMouseScreen();
-        QRect getDesktopGeometry();
+        TQRect getDesktopGeometry();
 
         bool full_screen;
 
@@ -166,14 +167,14 @@ class MainWindow : public KMainWindow, virtual public DCOPInterface
 
         /* Maximum height value. */
         int max_height;
-        int mask_height;
+        int tqmask_height;
 
         /* Application border. */
         int margin;
 
         /* Interface modification timer. */
-        QTimer timer;
-        QTimer poller;
+        TQTimer timer;
+        TQTimer poller;
 
         /* Passive popup window. */
         KPassivePopup popup;
@@ -192,15 +193,15 @@ class MainWindow : public KMainWindow, virtual public DCOPInterface
         KGlobalAccel* global_key;
 
         /* Background widget. */
-        QWidget* back_widget;
+        TQWidget* back_widget;
 
         TabBar* tab_bar;
         TitleBar* title_bar;
 
         /* Inner konsole. */
         int selected_id;
-        QWidgetStack* widgets_stack;
-        QMap<int, Session*> sessions_stack;
+        TQWidgetStack* widgets_stack;
+        TQMap<int, Session*> sessions_stack;
 
         bool is_shutting_down;
         bool background_changed;
@@ -221,15 +222,15 @@ class MainWindow : public KMainWindow, virtual public DCOPInterface
 
 
     private slots:
-        void slotHandleRemoveSession(KAction::ActivationReason, Qt::ButtonState);
-        void slotHandleHorizontalSplit(KAction::ActivationReason, Qt::ButtonState);
-        void slotHandleVerticalSplit(KAction::ActivationReason, Qt::ButtonState);
-        void slotHandleRemoveTerminal(KAction::ActivationReason, Qt::ButtonState);
+        void slotHandleRemoveSession(KAction::ActivationReason, TQt::ButtonState);
+        void slotHandleHorizontalSplit(KAction::ActivationReason, TQt::ButtonState);
+        void slotHandleVerticalSplit(KAction::ActivationReason, TQt::ButtonState);
+        void slotHandleRemoveTerminal(KAction::ActivationReason, TQt::ButtonState);
 
         void slotInitSkin();
         void slotUpdateSize();
         void slotUpdateSize(int new_width, int new_height, int new_location);
-        void slotUpdateTitle(const QString& title);
+        void slotUpdateTitle(const TQString& title);
 
         void slotIncreaseHeight();
         void slotDecreaseHeight();