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, 29 insertions, 28 deletions

diff --git a/kexi/widget/tableview/kexiblobtableedit.h b/kexi/widget/tableview/kexiblobtableedit.h
index a44559be..fb64c21d 100644
--- a/kexi/widget/tableview/kexiblobtableedit.h
+++ b/kexi/widget/tableview/kexiblobtableedit.h
@@ -21,8 +21,8 @@
 #ifndef _KEXIBLOBTABLEEDIT_H_
 #define _KEXIBLOBTABLEEDIT_H_
 
-#include <qcstring.h>
-#include <qcache.h>
+#include <tqcstring.h>
+#include <tqcache.h>
 
 #include <kurl.h>
 
@@ -31,19 +31,20 @@
 
 class KTempFile;
 class KProcess;
-class QTextEdit;
+class TQTextEdit;
 
 class KexiBlobTableEdit : public KexiTableEdit
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		KexiBlobTableEdit(KexiTableViewColumn &column, QWidget *parent=0);
+		KexiBlobTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0);
 		virtual ~KexiBlobTableEdit();
 
 		bool valueIsNull();
 		bool valueIsEmpty();
 
-		virtual QVariant value();
+		virtual TQVariant value();
 
 		virtual bool cursorAtStart();
 		virtual bool cursorAtEnd();
@@ -51,17 +52,17 @@ class KexiBlobTableEdit : public KexiTableEdit
 		/*! Reimplemented: resizes a view(). */
 		virtual void resize(int w, int h);
 
-		virtual void showFocus( const QRect& r, bool readOnly );
+		virtual void showFocus( const TQRect& r, bool readOnly );
 
 		virtual void hideFocus();
 
 		/*! \return total size of this editor, including popup button. */
-		virtual QSize totalSize() const;
+		virtual TQSize totalSize() const;
 
-		virtual void paintFocusBorders( QPainter *p, QVariant &, int x, int y, int w, int h );
+		virtual void paintFocusBorders( TQPainter *p, TQVariant &, int x, int y, int w, int h );
 
 		/*! Reimplemented to handle the key events. */
-		virtual bool handleKeyPress( QKeyEvent* ke, bool editorActive );
+		virtual bool handleKeyPress( TQKeyEvent* ke, bool editorActive );
 
 		/*! Handles double click request coming from the table view. 
 		 \return true if it has been consumed. 
@@ -70,22 +71,22 @@ class KexiBlobTableEdit : public KexiTableEdit
 
 		/*! Handles action having standard name \a actionName. 
 		 Action could be: "edit_cut", "edit_paste", etc. */
-		virtual void handleAction(const QString& actionName);
+		virtual void handleAction(const TQString& actionName);
 
 		/*! Handles copy action for value. The \a value is copied to clipboard in format appropriate 
 		 for the editor's impementation, e.g. for image cell it can be a pixmap. 
 		 \a visibleValue is unused here. Reimplemented after KexiTableEdit. */
-		virtual void handleCopyAction(const QVariant& value, const QVariant& visibleValue);
+		virtual void handleCopyAction(const TQVariant& value, const TQVariant& visibleValue);
 
-		virtual void setupContents( QPainter *p, bool focused, const QVariant& val, 
-			QString &txt, int &align, int &x, int &y_offset, int &w, int &h );
+		virtual void setupContents( TQPainter *p, bool focused, const TQVariant& val, 
+			TQString &txt, int &align, int &x, int &y_offset, int &w, int &h );
 
 	protected slots:
 		void slotUpdateActionsAvailabilityRequested(bool& valueIsNull, bool& valueIsReadOnly);
 
 		void handleInsertFromFileAction(const KURL& url);
-		void handleAboutToSaveAsAction(QString& origFilename, QString& fileExtension, bool& dataIsEmpty);
-		void handleSaveAsAction(const QString& fileName);
+		void handleAboutToSaveAsAction(TQString& origFilename, TQString& fileExtension, bool& dataIsEmpty);
+		void handleSaveAsAction(const TQString& fileName);
 		void handleCutAction();
 		void handleCopyAction();
 		void handlePasteAction();
@@ -94,26 +95,26 @@ class KexiBlobTableEdit : public KexiTableEdit
 
 	protected:
 		//! initializes this editor with \a add value
-		virtual void setValueInternal(const QVariant& add, bool removeOld);
+		virtual void setValueInternal(const TQVariant& add, bool removeOld);
 
-		//todo QString openWithDlg(const QString& file);
-		//todo void execute(const QString& app, const QString& file);
+		//todo TQString openWithDlg(const TQString& file);
+		//todo void execute(const TQString& app, const TQString& file);
 
 		//! @internal
-		void updateFocus( const QRect& r );
+		void updateFocus( const TQRect& r );
 
 		void signalEditRequested();
 
 		//! @internal
-		void executeCopyAction(const QByteArray& data);
+		void executeCopyAction(const TQByteArray& data);
 
-		virtual bool eventFilter( QObject *o, QEvent *e );
+		virtual bool eventFilter( TQObject *o, TQEvent *e );
 
 		class Private;
 		Private *d;
 //todo		KTempFile* m_tempFile;
 //todo		KProcess* m_proc;
-//todo		QTextEdit *m_content;
+//todo		TQTextEdit *m_content;
 };
 
 KEXI_DECLARE_CELLEDITOR_FACTORY_ITEM(KexiBlobEditorFactoryItem)
@@ -128,7 +129,7 @@ KEXI_DECLARE_CELLEDITOR_FACTORY_ITEM(KexiBlobEditorFactoryItem)
 class KexiKIconTableEdit : public KexiTableEdit
 {
 	public:
-		KexiKIconTableEdit(KexiTableViewColumn &column, QWidget *parent=0);
+		KexiKIconTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0);
 
 		virtual ~KexiKIconTableEdit();
 
@@ -140,23 +141,23 @@ class KexiKIconTableEdit : public KexiTableEdit
 		//! (check this with KexiDB::Field::hasEmptyProperty()), 
 		virtual bool valueIsEmpty();
 
-		virtual QVariant value();
+		virtual TQVariant value();
 
 		virtual bool cursorAtStart();
 		virtual bool cursorAtEnd();
 
 		virtual void clear();
 
-		virtual void setupContents( QPainter *p, bool focused, const QVariant& val, 
-			QString &txt, int &align, int &x, int &y_offset, int &w, int &h );
+		virtual void setupContents( TQPainter *p, bool focused, const TQVariant& val, 
+			TQString &txt, int &align, int &x, int &y_offset, int &w, int &h );
 
 		/*! Handles copy action for value. Does nothing.
 		 \a visibleValue is unused here. Reimplemented after KexiTableEdit. */
-		virtual void handleCopyAction(const QVariant& value, const QVariant& visibleValue);
+		virtual void handleCopyAction(const TQVariant& value, const TQVariant& visibleValue);
 
 	protected:
 		//! initializes this editor with \a add value
-		virtual void setValueInternal(const QVariant& add, bool removeOld);
+		virtual void setValueInternal(const TQVariant& add, bool removeOld);
 
 		void showHintButton();
 		void init();