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, 9 insertions, 9 deletions

diff --git a/kexi/plugins/forms/widgets/kexidbutils.h b/kexi/plugins/forms/widgets/kexidbutils.h
index 386f1ee5..06f49406 100644
--- a/kexi/plugins/forms/widgets/kexidbutils.h
+++ b/kexi/plugins/forms/widgets/kexidbutils.h
@@ -20,36 +20,36 @@
 #ifndef KDBWIDGETS_UTILS_H
 #define KDBWIDGETS_UTILS_H
 
-#include <qpopupmenu.h>
+#include <tqpopupmenu.h>
 #include <kexidataiteminterface.h>
 
-QColor lighterGrayBackgroundColor(const QPalette& palette);
+TQColor lighterGrayBackgroundColor(const TQPalette& palette);
 
 //! @short Used for extending editor widgets' context menu. 
 /*! @internal This is performed by adding a title and disabling editing 
  actions when "read only" flag is true. */
-class KexiDBWidgetContextMenuExtender : public QObject
+class KexiDBWidgetContextMenuExtender : public TQObject
 {
 	public:
-		KexiDBWidgetContextMenuExtender( QObject* parent, KexiDataItemInterface* iface );
+		KexiDBWidgetContextMenuExtender( TQObject* tqparent, KexiDataItemInterface* iface );
 		~KexiDBWidgetContextMenuExtender();
 
 		//! Creates title for context menu \a menu
-		void createTitle(QPopupMenu *menu);
+		void createTitle(TQPopupMenu *menu);
 
 		//! Enables or disables context menu actions that can modify the value.
 		//! The menu has to be previously provided by createTitle().
 		void updatePopupMenuActions();
 
 		/*! Updates title for context menu based on data item \a iface caption or name
-		 Used in createTitle(QPopupMenu *menu) and KexiDBImageBox.
+		 Used in createTitle(TQPopupMenu *menu) and KexiDBImageBox.
 		 \return true is the title has been added. */
-		static bool updateContextMenuTitleForDataItem(QPopupMenu *menu, KexiDataItemInterface* iface, 
-			const QString& icon = QString::null);
+		static bool updateContextMenuTitleForDataItem(TQPopupMenu *menu, KexiDataItemInterface* iface, 
+			const TQString& icon = TQString());
 
 	protected:
 		KexiDataItemInterface* m_iface;
-		QGuardedPtr<QPopupMenu> m_contextMenu;
+		TQGuardedPtr<TQPopupMenu> m_contextMenu;
 		bool m_contextMenuHasTitle; //!< true if KPopupTitle has been added to the context menu.
 };