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

4 files changed, 31 insertions, 30 deletions

diff --git a/kexi/tests/gui/finddialog/finddialog.pro b/kexi/tests/gui/finddialog/finddialog.pro
index f76b5372..dfbdd7eb 100644
--- a/kexi/tests/gui/finddialog/finddialog.pro
+++ b/kexi/tests/gui/finddialog/finddialog.pro
@@ -5,12 +5,12 @@ include( $(KEXI)/common.pro )
 CONFIG		+= qt warn_on release
 DEPENDPATH	= ../../include
 
-system( bash kmoc )
+system( bash ktqmoc )
 
 TARGET = finddialogtest
 DESTDIR=.
 
-system( bash kmoc )
+system( bash ktqmoc )
 system( bash kdcopidl )
 
 SOURCES = kexifinddialog.cpp main.cpp
diff --git a/kexi/tests/gui/finddialog/kexifinddialog.cpp b/kexi/tests/gui/finddialog/kexifinddialog.cpp
index 64f54d51..5c3a7e4d 100644
--- a/kexi/tests/gui/finddialog/kexifinddialog.cpp
+++ b/kexi/tests/gui/finddialog/kexifinddialog.cpp
@@ -24,14 +24,14 @@
 #include <kcombobox.h>
 #include <klocale.h>
 
-#include <qcheckbox.h>
-#include <qlabel.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
 
-KexiFindDialog::KexiFindDialog( bool replaceMode, QWidget* parent, const char* name, bool modal )
- : KexiFindDialogBase(parent, name, modal)
+KexiFindDialog::KexiFindDialog( bool replaceMode, TQWidget* tqparent, const char* name, bool modal )
+ : KexiFindDialogBase(tqparent, name, modal)
  , m_replaceMode(true)
 {
-	m_btnFind->setIconSet(KStdGuiItem::find().iconSet());
+	m_btnFind->setIconSet(KStdGuiItem::tqfind().iconSet());
 	m_btnClose->setIconSet(KStdGuiItem::close().iconSet());
 	setReplaceMode(replaceMode);
 	m_lookIn->insertItem(i18n("(All columns)"));
diff --git a/kexi/tests/gui/finddialog/kexifinddialog.h b/kexi/tests/gui/finddialog/kexifinddialog.h
index 9025d152..a6cdc47c 100644
--- a/kexi/tests/gui/finddialog/kexifinddialog.h
+++ b/kexi/tests/gui/finddialog/kexifinddialog.h
@@ -24,38 +24,39 @@
 
 /*! @brief A Kexi-specific "Find text" dialog.
 
-	Also used for replace.
+	Also used for tqreplace.
 */
 class KexiFindDialog : public KexiFindDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		KexiFindDialog( bool replaceMode, QWidget* parent = 0, const char* name = 0, bool modal = FALSE );
+		KexiFindDialog( bool replaceMode, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE );
 		virtual ~KexiFindDialog();
 
 #if 0
 TODO TODO TODO TODO TODO TODO 
 	/*! Sets \a columnNames list for 'look in column' combo box. 
 	 "(All columns)" item is also prepended. */
-	void setLookInColumnList(const QStringList& columnNames);
+	void setLookInColumnList(const TQStringList& columnNames);
 
 	/*! \return a list for 'look in column' combo box. 
 	 "(All columns)" item is also prepended. */
-	QStringList* lookInColumnList() const;
+	TQStringList* lookInColumnList() const;
 
 	/*! \return column name selected in 'look in column' combo box.
 	 If "(All columns)" item is selected, "*" is returned. */
-	QString lookInColumn() const;
+	TQString lookInColumn() const;
 
 	/*! Selects \a columnName to be selected 'look in column'.
 	 By default "(All columns)" item is selected. To select this item, pass "*". */
-	void setLookInColumn(const QString& columnName);
+	void setLookInColumn(const TQString& columnName);
 
 #endif
 
 	public slots:
 		/*! Sets or clears replace mode. 
-		 For replace mode 'prompt or replace' option is visible.
+		 For replace mode 'prompt or tqreplace' option is visible.
 		*/
 		void setReplaceMode(bool set);
 
diff --git a/kexi/tests/gui/finddialog/kexifinddialogbase.ui b/kexi/tests/gui/finddialog/kexifinddialogbase.ui
index f4684bff..41e4294b 100644
--- a/kexi/tests/gui/finddialog/kexifinddialogbase.ui
+++ b/kexi/tests/gui/finddialog/kexifinddialogbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>KexiFindDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>KexiFindDialogBase</cstring>
     </property>
@@ -33,7 +33,7 @@
                 <bool>false</bool>
             </property>
         </widget>
-        <widget class="QCheckBox" row="4" column="2">
+        <widget class="TQCheckBox" row="4" column="2">
             <property name="name">
                 <cstring>m_caseSensitive</cstring>
             </property>
@@ -81,7 +81,7 @@
                 <enum>NoInsertion</enum>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -92,7 +92,7 @@
                 <cstring>m_textToFind</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>m_replaceLbl</cstring>
             </property>
@@ -103,7 +103,7 @@
                 <cstring>m_textToReplace</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>textLabel2_2_2</cstring>
             </property>
@@ -114,7 +114,7 @@
                 <cstring>m_search</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>textLabel2_2_3</cstring>
             </property>
@@ -159,7 +159,7 @@
                 <enum>NoInsertion</enum>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>textLabel2_2</cstring>
             </property>
@@ -180,14 +180,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>16</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QCheckBox" row="5" column="2">
+        <widget class="TQCheckBox" row="5" column="2">
             <property name="name">
                 <cstring>m_wholeWords</cstring>
             </property>
@@ -198,7 +198,7 @@
                 <string>&amp;Whole words only</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="6" column="2">
+        <widget class="TQCheckBox" row="6" column="2">
             <property name="name">
                 <cstring>m_promptOnReplace</cstring>
             </property>
@@ -206,7 +206,7 @@
                 <enum>WheelFocus</enum>
             </property>
             <property name="text">
-                <string>Prompt on replace</string>
+                <string>Prompt on tqreplace</string>
             </property>
             <property name="checked">
                 <bool>true</bool>
@@ -222,16 +222,16 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget" row="0" column="4" rowspan="8" colspan="1">
+        <widget class="TQLayoutWidget" row="0" column="4" rowspan="8" colspan="1">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -279,7 +279,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>40</height>
@@ -309,7 +309,7 @@
     <tabstop>m_caseSensitive</tabstop>
     <tabstop>m_wholeWords</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>