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, 52 insertions, 51 deletions

diff --git a/kexi/formeditor/widgetlibrary.h b/kexi/formeditor/widgetlibrary.h
index f4f8c1f3..d8a6529a 100644
--- a/kexi/formeditor/widgetlibrary.h
+++ b/kexi/formeditor/widgetlibrary.h
@@ -22,21 +22,21 @@
 #ifndef KFORMDESIGNERWIDGETLIBRARY_H
 #define KFORMDESIGNERWIDGETLIBRARY_H
 
-#include <qobject.h>
-#include <qmap.h>
-#include <qdict.h>
+#include <tqobject.h>
+#include <tqmap.h>
+#include <tqdict.h>
 
 #include "widgetfactory.h"
 
-template<class type> class QPtrList;
-template<class type> class QValueVector;
+template<class type> class TQPtrList;
+template<class type> class TQValueVector;
 class KActionCollection;
 class KAction;
-class QWidget;
-class QPopupMenu;
-class QVariant;
-class QDomDocument;
-class QDomElement;
+class TQWidget;
+class TQPopupMenu;
+class TQVariant;
+class TQDomDocument;
+class TQDomElement;
 
 namespace KFormDesigner {
 
@@ -45,7 +45,7 @@ class ObjectTreeItem;
 class WidgetLibraryPrivate;
 class WidgetPropertySet;
 
-typedef QPtrList<KAction> ActionList;
+typedef TQPtrList<KAction> ActionList;
 
 /**
  * This class searches for factories and provides KActions for widget creation.
@@ -53,9 +53,10 @@ typedef QPtrList<KAction> ActionList;
  * You call WidgetLibrary functions instead of calling directly factories.
  * See WidgetFactory for a description of the functions.
  */
-class KFORMEDITOR_EXPORT WidgetLibrary : public QObject
+class KFORMEDITOR_EXPORT WidgetLibrary : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
 		/*! Constructs WidgetLibrary object.
@@ -65,69 +66,69 @@ class KFORMEDITOR_EXPORT WidgetLibrary : public QObject
 		 By default (when supportedFactoryGroups is empty) only factories having empty
 		 "X-KFormDesigner-FactoryGroup" field will be loaded.
 		 Factory group names are case-insensitive. */
-		WidgetLibrary(QObject *parent=0, const QStringList& supportedFactoryGroups = QStringList());
+		WidgetLibrary(TQObject *tqparent=0, const TQStringList& supportedFactoryGroups = TQStringList());
 
 		virtual ~WidgetLibrary();
 
 		/**
 		 * creates actions for widget creating
 		 */
-		ActionList createWidgetActions(KXMLGUIClient* client, KActionCollection *parent, 
-			QObject *receiver, const char *slot);
+		ActionList createWidgetActions(KXMLGUIClient* client, KActionCollection *tqparent, 
+			TQObject *receiver, const char *slot);
 
 		void addCustomWidgetActions(KActionCollection *col);
 
 //old		/**
 //old		 * creates the XML for widget actions
 //old		 */
-//old		QString createXML();
+//old		TQString createXML();
 
 		/**
 		 * searches the right factory and creates a widget.
 		 * \return the widget or 0 if something falid
 		 */
-		QWidget *createWidget(const QCString &classname, QWidget *parent, const char *name, Container *c,
+		TQWidget *createWidget(const TQCString &classname, TQWidget *tqparent, const char *name, Container *c,
 			int options = WidgetFactory::DefaultOptions);
 
-		bool createMenuActions(const QCString &c, QWidget *w, QPopupMenu *menu,
+		bool createMenuActions(const TQCString &c, TQWidget *w, TQPopupMenu *menu,
 			KFormDesigner::Container *container);
 
 		/** 
 		 * Shows orientation selection popup. 
 		 * \return one of the following values: 
-		 * - WidgetFactory::AnyOrientation (means no selection has been made, i.e. it was cancelled)
-		 * - WidgetFactory::HorizontalOrientation
-		 * - WidgetFactory::VerticalOrientation
+		 * - WidgetFactory::AnyQt::Orientation (means no selection has been made, i.e. it was cancelled)
+		 * - WidgetFactory::HorizontalQt::Orientation
+		 * - WidgetFactory::VerticalQt::Orientation
 		 */
 		WidgetFactory::CreateWidgetOptions showOrientationSelectionPopup(
-			const QCString &classname, QWidget* parent, const QPoint& pos);
+			const TQCString &classname, TQWidget* tqparent, const TQPoint& pos);
 
-		QString internalProperty(const QCString& classname, const QCString& property);
+		TQString internalProperty(const TQCString& classname, const TQCString& property);
 
-		QString displayName(const QCString &classname);
-		QString namePrefix(const QCString &classname);
-		QString textForWidgetName(const QCString &name, const QCString &className);
+		TQString displayName(const TQCString &classname);
+		TQString namePrefix(const TQCString &classname);
+		TQString textForWidgetName(const TQCString &name, const TQCString &className);
 
 		/*! Checks if the \a classname is an alternate classname,
 		 and returns the good classname. 
 		 If \a classname is not alternate, \a classname is returned. */
-		QCString classNameForAlternate(const QCString &classname);
-		QString iconName(const QCString &classname);
-		QString includeFileName(const QCString &classname);
-		QString savingName(const QCString &classname);
-
-		bool startEditing(const QCString &classname, QWidget *w, Container *container);
-		bool previewWidget(const QCString &classname, QWidget *widget, Container *container);
-		bool clearWidgetContent(const QCString &classname, QWidget *w);
-
-		bool saveSpecialProperty(const QCString &classname, const QString &name,
-			const QVariant &value, QWidget *w, QDomElement &parentNode, QDomDocument &parent);
-		bool readSpecialProperty(const QCString &classname, QDomElement &node, QWidget *w,
+		TQCString classNameForAlternate(const TQCString &classname);
+		TQString iconName(const TQCString &classname);
+		TQString includeFileName(const TQCString &classname);
+		TQString savingName(const TQCString &classname);
+
+		bool startEditing(const TQCString &classname, TQWidget *w, Container *container);
+		bool previewWidget(const TQCString &classname, TQWidget *widget, Container *container);
+		bool clearWidgetContent(const TQCString &classname, TQWidget *w);
+
+		bool saveSpecialProperty(const TQCString &classname, const TQString &name,
+			const TQVariant &value, TQWidget *w, TQDomElement &tqparentNode, TQDomDocument &tqparent);
+		bool readSpecialProperty(const TQCString &classname, TQDomElement &node, TQWidget *w,
 			ObjectTreeItem *item);
-		bool isPropertyVisible(const QCString &classname, QWidget *w,
-			const QCString &property, bool multiple = false, bool isTopLevel = false);
+		bool isPropertyVisible(const TQCString &classname, TQWidget *w,
+			const TQCString &property, bool multiple = false, bool isTopLevel = false);
 
-		QValueList<QCString> autoSaveProperties(const QCString &classname);
+		TQValueList<TQCString> autoSaveProperties(const TQCString &classname);
 
 		WidgetInfo* widgetInfoForClassName(const char* classname);
 
@@ -148,34 +149,34 @@ class KFORMEDITOR_EXPORT WidgetLibrary : public QObject
 		 for a class described by \a winfo. The name can be displayed in
 		 PropertyEditor. The name is retrieved from class' widget library.
 		 If this library doesn't define description for such property,
-		 and there is a parent library for \a winfo defined, parent library
+		 and there is a tqparent library for \a winfo defined, tqparent library
 		 is asked for returning description string.
 		 Eventually, if even this failed, empty string is returned.
 		 @see WidgetFactory::propertyDescForName() */
-		QString propertyDescForName(WidgetInfo *winfo, const QCString& propertyName);
+		TQString propertyDescForName(WidgetInfo *winfo, const TQCString& propertyName);
 
 		/*! \return The i18n'ed name of the property's value whose name is \a name.
 		 Works in the same way as propertyDescForName(): if actual library
-		 does not define a description we are looking for, parent factory is asked
+		 does not define a description we are looking for, tqparent factory is asked
 		 to return such description.
 		 Eventually, if even this failed, empty string is returned.
 		 @see WidgetFactory::propertyDescForValue() */
-		QString propertyDescForValue(WidgetInfo *winfo, const QCString& name);
+		TQString propertyDescForValue(WidgetInfo *winfo, const TQCString& name);
 
 		/*! Used by WidgetPropertySet::setWidget() after creating properties. */
-		void setPropertyOptions( WidgetPropertySet &list, const WidgetInfo& winfo, QWidget* w );
+		void setPropertyOptions( WidgetPropertySet &list, const WidgetInfo& winfo, TQWidget* w );
 
 		/*! \return true if property sets should be reloaded for \a property property, 
 		 \a classname class and widget \a w when a given property value changed. */
-		bool propertySetShouldBeReloadedAfterPropertyChange(const QCString& classname, QWidget *w, 
-			const QCString& property);
+		bool propertySetShouldBeReloadedAfterPropertyChange(const TQCString& classname, TQWidget *w, 
+			const TQCString& property);
 
 	signals:
-		void prepareInsert(const QCString &c);
+		void prepareInsert(const TQCString &c);
 
 		//! Received by KexiFormPart::slotWidgetCreatedByFormsLibrary() so we can add drag/drop 
 		//! connection for the new widget
-		void widgetCreated(QWidget *widget);
+		void widgetCreated(TQWidget *widget);
 
 	protected:
 		/**
@@ -192,7 +193,7 @@ class KFORMEDITOR_EXPORT WidgetLibrary : public QObject
 		 * but don't want to confuse the user... are you confused now?
 		 * NB: not implemented yet
 		 */
-		void setFilter(const QRegExp &expr);
+		void setFilter(const TQRegExp &expr);
 #endif
 
 		/**