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

diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.h b/kexi/plugins/queries/kexiquerydesignersqlhistory.h
index a8d0c2e0..6709a22f 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.h
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.h
@@ -18,65 +18,66 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifndef KEXIQUERYDESIGNERSQLHISTORY_H
-#define KEXIQUERYDESIGNERSQLHISTORY_H
+#ifndef KEXITQUERYDESIGNERSQLHISTORY_H
+#define KEXITQUERYDESIGNERSQLHISTORY_H
 
-#include <qscrollview.h>
-#include <qdatetime.h>
-#include <qptrlist.h>
-#include <qmap.h>
-#include <qsimplerichtext.h>
+#include <tqscrollview.h>
+#include <tqdatetime.h>
+#include <tqptrlist.h>
+#include <tqmap.h>
+#include <tqsimplerichtext.h>
 
-class QSimpleRichText;
+class TQSimpleRichText;
 class KPopupMenu;
 
 class HistoryEntry
 {
 	public:
-		HistoryEntry(bool success, const QTime &time, const QString &statement, /*int y,*/ const QString &error = QString::null);
+		HistoryEntry(bool success, const TQTime &time, const TQString &statement, /*int y,*/ const TQString &error = TQString());
 		~HistoryEntry();
 
-		QRect	geometry(int y, int width, QFontMetrics f);
-		void	drawItem(QPainter *p, int width, const QColorGroup &cg);
+		TQRect	tqgeometry(int y, int width, TQFontMetrics f);
+		void	drawItem(TQPainter *p, int width, const TQColorGroup &cg);
 
-		void	setSelected(bool selected, const QColorGroup &cg);
+		void	setSelected(bool selected, const TQColorGroup &cg);
 		bool	isSelected() const { return m_selected; }
-		void	highlight(const QColorGroup &selected);
+		void	highlight(const TQColorGroup &selected);
 
-		QString	statement() { return m_statement; }
-		void updateTime(const QTime &execTime);
+		TQString	statement() { return m_statement; }
+		void updateTime(const TQTime &execTime);
 
 	private:
 		bool	m_succeed;
-		QTime	m_execTime;
-		QString	m_statement;
-		QString m_error;
-		QSimpleRichText	*m_formated;
+		TQTime	m_execTime;
+		TQString	m_statement;
+		TQString m_error;
+		TQSimpleRichText	*m_formated;
 
 		int	m_y;
 		bool	m_selected;
 };
 
-typedef QPtrList<HistoryEntry> History;
+typedef TQPtrList<HistoryEntry> History;
 
-class KexiQueryDesignerSQLHistory : public QScrollView
+class KexiQueryDesignerSQLHistory : public TQScrollView
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		KexiQueryDesignerSQLHistory(QWidget *parent, const char *name=0);
+		KexiQueryDesignerSQLHistory(TQWidget *tqparent, const char *name=0);
 		virtual ~KexiQueryDesignerSQLHistory();
 
 		KPopupMenu* popupMenu() const;
 
-//		void		contextMenu(const QPoint &pos, HistoryEntry *e);
+//		void		contextMenu(const TQPoint &pos, HistoryEntry *e);
 
 		void setHistory(History *h);
 
-		QString selectedStatement() const;
+		TQString selectedStatement() const;
 
 	public slots:
-		void addEvent(const QString& q, bool s, const QString &error);
+		void addEvent(const TQString& q, bool s, const TQString &error);
 
 		void slotToClipboard();
 		void slotEdit();
@@ -87,12 +88,12 @@ class KexiQueryDesignerSQLHistory : public QScrollView
 
 	protected:
 		void addEntry(HistoryEntry *e);
-		virtual void drawContents(QPainter *p, int cx, int cy, int cw, int ch);
-		virtual void contentsMousePressEvent(QMouseEvent * e);
-		virtual void contentsMouseDoubleClickEvent(QMouseEvent * e);
+		virtual void drawContents(TQPainter *p, int cx, int cy, int cw, int ch);
+		virtual void contentsMousePressEvent(TQMouseEvent * e);
+		virtual void contentsMouseDoubleClickEvent(TQMouseEvent * e);
 
 	signals:
-		void editRequested(const QString &text);
+		void editRequested(const TQString &text);
 		void currentItemDoubleClicked();
 
 	private: