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, 14 insertions, 13 deletions

diff --git a/kexi/widget/kexidataawareview.h b/kexi/widget/kexidataawareview.h
index 8f1d369f..31a43445 100644
--- a/kexi/widget/kexidataawareview.h
+++ b/kexi/widget/kexidataawareview.h
@@ -42,32 +42,33 @@ class KEXIEXTWIDGETS_EXPORT KexiDataAwareView : public KexiViewBase,
 	public KexiSearchAndReplaceViewInterface
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		KexiDataAwareView(KexiMainWindow *mainWin, QWidget *parent, const char *name = 0);
+		KexiDataAwareView(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0);
 
-		QWidget* mainWidget();
+		TQWidget* mainWidget();
 
-		virtual QSize minimumSizeHint() const;
+		virtual TQSize tqminimumSizeHint() const;
 		
-		virtual QSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 		
 		KexiDataAwareObjectInterface* dataAwareObject() const { return m_dataAwareObject; }
 
-		/*! Sets up data for find/replace dialog, based on view's data model. 
+		/*! Sets up data for tqfind/replace dialog, based on view's data model. 
 		 Implemented for KexiSearchAndReplaceViewInterface. */
-		virtual bool setupFindAndReplace(QStringList& columnNames, QStringList& columnCaptions,
-			QString& currentColumnName);
+		virtual bool setupFindAndReplace(TQStringList& columnNames, TQStringList& columnCaptions,
+			TQString& currentColumnName);
 
 		/*! Finds \a valueToFind within the view. 
 		 Implemented for KexiSearchAndReplaceViewInterface. */
-		virtual tristate find(const QVariant& valueToFind, 
+		virtual tristate tqfind(const TQVariant& valueToFind, 
 			const KexiSearchAndReplaceViewInterface::Options& options, bool next);
 
 		/*! Finds \a valueToFind within the view and replaces with \a replacement. 
 		 Implemented for KexiSearchAndReplaceViewInterface. */
-		virtual tristate findNextAndReplace(const QVariant& valueToFind, 
-			const QVariant& replacement, 
+		virtual tristate findNextAndReplace(const TQVariant& valueToFind, 
+			const TQVariant& replacement, 
 			const KexiSearchAndReplaceViewInterface::Options& options, bool replaceAll);
 
 	public slots:
@@ -94,14 +95,14 @@ class KEXIEXTWIDGETS_EXPORT KexiDataAwareView : public KexiViewBase,
 		void editReplace();*/
 
 	protected slots:
-//		void slotCellSelected(const QVariant& v); //!< @internal
+//		void slotCellSelected(const TQVariant& v); //!< @internal
 		void slotCellSelected(int col, int row);
 		void reloadActions();
 		void slotUpdateRowActions(int row);
 		void slotClosing(bool& cancel);
 
 	protected:
-		void init( QWidget* viewWidget, KexiSharedActionClient* actionClient,
+		void init( TQWidget* viewWidget, KexiSharedActionClient* actionClient,
 			KexiDataAwareObjectInterface* dataAwareObject, 
 		// temporary, for KexiFormView in design mode 
 			bool noDataAware = false
@@ -109,7 +110,7 @@ class KEXIEXTWIDGETS_EXPORT KexiDataAwareView : public KexiViewBase,
 		void initActions();
 		virtual void updateActions(bool activated);
 
-		QWidget* m_internalView;
+		TQWidget* m_internalView;
 		KexiSharedActionClient* m_actionClient;
 		KexiDataAwareObjectInterface* m_dataAwareObject;
 };