TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


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

1 files changed, 8 insertions, 7 deletions

diff --git a/kspread/dialogs/kspread_dlg_subtotal.h b/kspread/dialogs/kspread_dlg_subtotal.h
index 8bb2f3fb..230560a5 100644
--- a/kspread/dialogs/kspread_dlg_subtotal.h
+++ b/kspread/dialogs/kspread_dlg_subtotal.h
@@ -25,10 +25,10 @@
 
 #include <kdialogbase.h>
 
-#include <qpoint.h>
-#include <qrect.h>
+#include <tqpoint.h>
+#include <tqrect.h>
 
-class QLineEdit;
+class TQLineEdit;
 
 namespace KSpread
 {
@@ -39,13 +39,14 @@ class View;
 class SubtotalDialog : public KDialogBase
 { 
   Q_OBJECT
+  TQ_OBJECT
 
  public:
-  SubtotalDialog( View * parent, QRect const & selection, 
+  SubtotalDialog( View * tqparent, TQRect const & selection, 
                       const char * name );
   ~SubtotalDialog();
 
-  QRect const & selection() const { return m_selection; }
+  TQRect const & selection() const { return m_selection; }
   Sheet * sheet() const { return m_pSheet; }
 
  private slots:
@@ -56,14 +57,14 @@ class SubtotalDialog : public KDialogBase
  private:
   View  *    m_pView;
   Sheet *    m_pSheet;
-  QRect             m_selection;
+  TQRect             m_selection;
   Subtotal * m_dialog;
 
   void fillColumnBoxes();
   void fillFunctionBox();
   void removeSubtotalLines();
   bool addSubtotal( int mainCol, int column, int row, int topRow, 
-                    bool addRow, QString const & text );
+                    bool addRow, TQString const & text );
 };
 
 } // namespace KSpread