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, 16 insertions, 15 deletions

diff --git a/kexi/widget/kexismalltoolbutton.h b/kexi/widget/kexismalltoolbutton.h
index 59af7cfa..90ba7e5e 100644
--- a/kexi/widget/kexismalltoolbutton.h
+++ b/kexi/widget/kexismalltoolbutton.h
@@ -20,40 +20,41 @@
 #ifndef KEXISMALLTOOLBUTTON_H
 #define KEXISMALLTOOLBUTTON_H
 
-#include <qtoolbutton.h>
+#include <tqtoolbutton.h>
 #include <kaction.h>
 
-class QIconSet;
+class TQIconSet;
 
 //! A small tool button with icon and optional text
-class KEXIEXTWIDGETS_EXPORT KexiSmallToolButton : public QToolButton
+class KEXIEXTWIDGETS_EXPORT KexiSmallToolButton : public TQToolButton
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		KexiSmallToolButton(QWidget* parent, const QString& text, 
-			const QString& icon = QString::null, const char* name = 0);
+		KexiSmallToolButton(TQWidget* tqparent, const TQString& text, 
+			const TQString& icon = TQString(), const char* name = 0);
 
-		KexiSmallToolButton(QWidget* parent, const QString& text, 
-			const QIconSet& iconSet, const char* name = 0);
+		KexiSmallToolButton(TQWidget* tqparent, const TQString& text, 
+			const TQIconSet& iconSet, const char* name = 0);
 
-		KexiSmallToolButton(QWidget* parent, KAction *action);
+		KexiSmallToolButton(TQWidget* tqparent, KAction *action);
 		
 		virtual ~KexiSmallToolButton();
 
 		void updateAction();
 
-		virtual void setIconSet( const QIconSet& iconSet );
-		virtual void setIconSet( const QString& icon );
-		virtual void setTextLabel( const QString & newLabel, bool tipToo );
-		virtual void setTextLabel( const QString & newLabel ) { setTextLabel(newLabel, false); }
+		virtual void setIconSet( const TQIconSet& iconSet );
+		virtual void setIconSet( const TQString& icon );
+		virtual void setTextLabel( const TQString & newLabel, bool tipToo );
+		virtual void setTextLabel( const TQString & newLabel ) { setTextLabel(newLabel, false); }
 
 	protected:
-		void update(const QString& text, const QIconSet& iconSet, bool tipToo = false);
+		void update(const TQString& text, const TQIconSet& iconSet, bool tipToo = false);
 		void init();
-		virtual void drawButton( QPainter *_painter );
+		virtual void drawButton( TQPainter *_painter );
 
-		QGuardedPtr<KAction> m_action;
+		TQGuardedPtr<KAction> m_action;
 };
 
 #endif