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, 47 insertions, 46 deletions

diff --git a/kexi/main/keximainwindowimpl.h b/kexi/main/keximainwindowimpl.h
index 93545439..a2d820e8 100644
--- a/kexi/main/keximainwindowimpl.h
+++ b/kexi/main/keximainwindowimpl.h
@@ -45,6 +45,7 @@ namespace KexiPart {
 class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUIMessageHandler
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
 		/*! Creates an empty mainwindow. */
@@ -57,7 +58,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		static int create(int argc, char *argv[], KAboutData* aboutdata = 0);
 
 		//! \return KexiMainWindowImpl singleton (if it is instantiated)
-		static KexiMainWindowImpl* self() { return dynamic_cast<KexiMainWindowImpl*>(qApp->mainWidget()); }
+		static KexiMainWindowImpl* self() { return dynamic_cast<KexiMainWindowImpl*>(tqApp->mainWidget()); }
 
 		//! Project data of currently opened project or NULL if no project here yet.
 		virtual KexiProject *project();
@@ -84,10 +85,10 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		 as KexiPart::Part::supportedUserViewModes() for \a  item. */
 		bool openingAllowed(KexiPart::Item* item, int viewMode);
 
-		virtual bool eventFilter( QObject *obj, QEvent * e );
+		virtual bool eventFilter( TQObject *obj, TQEvent * e );
 
 		//! \return popup menu for \a popupName name.
-		virtual QPopupMenu* findPopupMenu(const char *popupName);
+		virtual TQPopupMenu* findPopupMenu(const char *popupName);
 
 		/*! Implemented for KexiMainWindow. */
 		virtual KActionPtrList allActions() const;
@@ -112,7 +113,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 	public slots:
 		/*! Inherited from KMdiMainFrm: we need to do some tasks before child is closed.
 			Just calls closeDialog(). Use closeDialog() if you need, not this one. */
-		virtual void closeWindow(KMdiChildView *pWnd, bool layoutTaskBar = true);
+		virtual void closeWindow(KMdiChildView *pWnd, bool tqlayoutTaskBar = true);
 
 		/*! Reimplemented for internal reasons. */
 		virtual void addWindow( KMdiChildView* pView, int flags = KMdi::StandardAdd );
@@ -124,7 +125,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		 messages asking for saving the will be skipped and the changes will be dropped. 
 		 This should not be usually used, maybe except for test suites 
 		 (see kexi/tests/altertable/ directory). */
-		tristate closeDialog(KexiDialogBase *dlg, bool layoutTaskBar, bool doNotSaveChanges = false);
+		tristate closeDialog(KexiDialogBase *dlg, bool tqlayoutTaskBar, bool doNotSaveChanges = false);
 
 		virtual void detachWindow(KMdiChildView *pWnd,bool bShow=true);
 		virtual void attachWindow(KMdiChildView *pWnd,bool bShow=true,bool bAutomaticResize=false);
@@ -137,12 +138,12 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		 \a errorMessage, if not 0, points to a string that can be set to error message
 		 if one encountered. */
 		virtual KexiDialogBase* openObject(KexiPart::Item *item, int viewMode, 
-			bool &openingCancelled, QMap<QString,QString>* staticObjectArgs = 0,
-			QString* errorMessage = 0);
+			bool &openingCancelled, TQMap<TQString,TQString>* staticObjectArgs = 0,
+			TQString* errorMessage = 0);
 
 		//! For convenience
-		virtual KexiDialogBase* openObject(const QCString& mime, const QString& name, 
-			int viewMode, bool &openingCancelled, QMap<QString,QString>* staticObjectArgs = 0);
+		virtual KexiDialogBase* openObject(const TQCString& mime, const TQString& name, 
+			int viewMode, bool &openingCancelled, TQMap<TQString,TQString>* staticObjectArgs = 0);
 
 		/*! Closes the object for \a item. 
 		 \return true on success (closing can be dealyed though), false on failure and cancelled 
@@ -151,14 +152,14 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 
 		/*! Implemented for KexiMainWindow */
 		virtual tristate saveObject( KexiDialogBase *dlg,
-			const QString& messageWhenAskingForName = QString::null, bool dontAsk = false );
+			const TQString& messageWhenAskingForName = TQString(), bool dontAsk = false );
 
 		/*! Implemented for KexiMainWindow */
 		virtual tristate getNewObjectInfo( KexiPart::Item *partItem, KexiPart::Part *part, 
-			bool& allowOverwriting, const QString& messageWhenAskingForName = QString::null );
+			bool& allowOverwriting, const TQString& messageWhenAskingForName = TQString() );
 
 		/*! Implemented for KexiMainWindow */
-		virtual void highlightObject(const QCString& mime, const QCString& name);
+		virtual void highlightObject(const TQCString& mime, const TQCString& name);
 
 		/*! Opens project pointed by \a projectData.
 		 Application state (e.g. actions) is updated. 
@@ -176,9 +177,9 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		 * If connection shortcut has been found and \a dbName is not provided,
 		  'kexi --skip-dialog file.kexic' is executed (or the connection is opened 
 		  directly if there's no porject opened in the current Kexi main window. */
-		tristate openProject(const QString& aFileName, KexiDB::ConnectionData *cdata, 
-			const QString& dbName = QString::null,
-			const QValueList<KexiProjectData::ObjectInfo>& autoopenObjects = QValueList<KexiProjectData::ObjectInfo>());
+		tristate openProject(const TQString& aFileName, KexiDB::ConnectionData *cdata, 
+			const TQString& dbName = TQString(),
+			const TQValueList<KexiProjectData::ObjectInfo>& autoopenObjects = TQValueList<KexiProjectData::ObjectInfo>());
 
 		/*! Helper. Opens project pointed by \a aFileName.
 		 Like above but \a fileNameForConnectionData can be passed instead of 
@@ -186,8 +187,8 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		 \return false if \a fileNameForConnectionData is not empty but there is no such
 		 connection in Kexi::connset() for this filename. 
 		 \a fileNameForConnectionData can be empty. */
-		tristate openProject(const QString& aFileName, 
-			const QString& fileNameForConnectionData, const QString& dbName = QString::null);
+		tristate openProject(const TQString& aFileName, 
+			const TQString& fileNameForConnectionData, const TQString& dbName = TQString());
 
 		/*! Creates a new project usign template pointed by \a projectData.
 		 Application state (e.g. actions) is updated. 
@@ -215,7 +216,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 
 		/*! Executes custom action for the main window, usually provided by a plugin. 
 		 Also used by KexiFormEventAction. */
-		virtual tristate executeCustomActionForObject(KexiPart::Item* item, const QString& actionName);
+		virtual tristate executeCustomActionForObject(KexiPart::Item* item, const TQString& actionName);
 
 	signals:
 		//! Emitted after opening a project, even after slotAutoOpenObjectsLater().
@@ -239,7 +240,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		void initPropertyEditor();
 
 		//! reimplementation of events
-//		virtual void	closeEvent(QCloseEvent *);
+//		virtual void	closeEvent(TQCloseEvent *);
 
 		/*! Creates standard actions like new, open, save ... */
 		void initActions();
@@ -254,20 +255,20 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		void storeSettings();
 
 		/*! Invalidates availability of all actions for current application state. */
-		void invalidateActions();
+		void tqinvalidateActions();
 
 		/*! Invalidates action availability for current application state.
 		 These actions are dependent on curently selected dialog. */
-		virtual void invalidateSharedActions(QObject *o);
+		virtual void tqinvalidateSharedActions(TQObject *o);
 
 		/*! Invalidates action availability for current application state.
 		 These actions only depend on project availability, not on curently selected dialog. */
-		void invalidateProjectWideActions();
+		void tqinvalidateProjectWideActions();
 
 		/*! Invalidates action availability for current application state.
 		 These actions only depend on curently selected dialog and currently selected view
 		 (KexiViewBase derived object) within this dialog. */
-		void invalidateViewModeActions();
+		void tqinvalidateViewModeActions();
 
 		/*! Shows dialog for creating new blank project,
 		 and creates one. Dialog is not shown if option for automatic creation
@@ -283,21 +284,21 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		 \a shortcutFileName, if not 0, will be set to a shortcut filename 
 		 (in case when server database project was selected). */
 		KexiProjectData* createBlankProjectData(bool &cancelled, bool confirmOverwrites = true, 
-			QString *shortcutFileName = 0);
+			TQString *shortcutFileName = 0);
 
-		void setWindowMenu(QPopupMenu *menu);
+		void setWindowMenu(TQPopupMenu *menu);
 
 		/*! \return focused kexi window (KexiDialogBase or KexiDockBase subclass) */
-//		QWidget* focusWindow() const;
+//		TQWidget* focusWindow() const;
 
 		/*! Reimplemented from KexiSharedActionHost:
 		 accepts only KexiDockBase and KexiDialogBase subclasses.  */
-		virtual bool acceptsSharedActions(QObject *w);
+		virtual bool acceptsSharedActions(TQObject *w);
 
 		/*! Performs lookup like in KexiSharedActionHost::focusWindow()
-		 but starting from \a w instead of a widget returned by QWidget::focusWidget().
+		 but starting from \a w instead of a widget returned by TQWidget::tqfocusWidget().
 		 \return NULL if no widget matches acceptsSharedActions() or if \a w is NULL. */
-		QWidget* findWindow(QWidget *w);
+		TQWidget* findWindow(TQWidget *w);
 
 		/*! Updates application's caption - also shows project's name. */
 		void updateAppCaption();
@@ -325,12 +326,12 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 			KexiPart::Part *prevDialogPart, int prevViewMode, KexiPart::Part *curDialogPart, int curViewMode );
 
 		/*! Used in openProject when running another Kexi process is required. */
-		tristate openProjectInExternalKexiInstance(const QString& aFileName, 
-			KexiDB::ConnectionData *cdata, const QString& dbName);
+		tristate openProjectInExternalKexiInstance(const TQString& aFileName, 
+			KexiDB::ConnectionData *cdata, const TQString& dbName);
 
 		/*! Used in openProject when running another Kexi process is required. */
-		tristate openProjectInExternalKexiInstance(const QString& aFileName, 
-			const QString& fileNameForConnectionData, const QString& dbName);
+		tristate openProjectInExternalKexiInstance(const TQString& aFileName, 
+			const TQString& fileNameForConnectionData, const TQString& dbName);
 
 	protected slots:
 
@@ -345,10 +346,10 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 
 		void slotPartLoaded(KexiPart::Part* p);
 
-		void slotCaptionForCurrentMDIChild(bool childrenMaximized);
+		void slotCaptionForCurrentMDIChild(bool tqchildrenMaximized);
 		void slotNoMaximizedChildFrmLeft(KMdiChildFrm*);
 		void slotLastChildViewClosed();
-		void slotChildViewIsDetachedNow(QWidget*);
+		void slotChildViewIsDetachedNow(TQWidget*);
 
 		//! internal - creates and initializes kexi project
 		void createKexiProject(KexiProjectData* new_data);
@@ -377,7 +378,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 
 		//! For convenience
 		KexiDialogBase* openObject(KexiPart::Item *item, int viewMode, 
-			QMap<QString,QString>* staticObjectArgs = 0)
+			TQMap<TQString,TQString>* staticObjectArgs = 0)
 		{
 			bool openingCancelled;
 			return openObject(item, viewMode, openingCancelled, staticObjectArgs);
@@ -391,17 +392,17 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		/*! Renames object pointed by \a item to a new name \a _newName.
 		 Sets \a success to false on failure. Used as a slot connected
 		 to KexiBrowser::renameItem() signal. */
-		void renameObject( KexiPart::Item *item, const QString& _newName, bool &succes );
+		void renameObject( KexiPart::Item *item, const TQString& _newName, bool &succes );
 
 		/*! Reaction for object rename (signalled by KexiProject).
 		 If this item has opened dialog, it's caption is updated,
 		 and also optionally application's caption. */
-		virtual void slotObjectRenamed(const KexiPart::Item &item, const QCString& oldName);
+		virtual void slotObjectRenamed(const KexiPart::Item &item, const TQCString& oldName);
 
 		virtual void fillWindowMenu();
 
-		void invalidateSharedActions();
-		void invalidateSharedActionsLater();
+		void tqinvalidateSharedActions();
+		void tqinvalidateSharedActionsLater();
 
 		//! Updates the statusbar, navigator and "Insert->....." actions, dependent on read-only state.
 		//! Only called on project opening and closing.
@@ -466,7 +467,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		virtual void acceptPropertySetEditing();
 
 		virtual void propertySetSwitched(KexiDialogBase *dlg, bool force=false,
-			bool preservePrevSelection = true, const QCString& propertyToSelect = QCString());
+			bool preservePrevSelection = true, const TQCString& propertyToSelect = TQCString());
 
 		/*! Handles changes in 'dirty' flag for dialogs. */
 		void slotDirtyFlagChanged(KexiDialogBase*);
@@ -484,7 +485,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		 If \a mimeType and \a databaseName are not empty, the wizard will only ask about 
 		 parameters of destination project and skip pages related to source project. 
 		 \a cdata connection data can be also provided to preselect server-based connections. */
-		tristate showProjectMigrationWizard(const QString& mimeType, const QString& databaseName,
+		tristate showProjectMigrationWizard(const TQString& mimeType, const TQString& databaseName,
 			const KexiDB::ConnectionData *cdata = 0);
 
 		//! Receives "selectionChanged()" signal from navigator to update some actions.
@@ -502,24 +503,24 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 
 		//! Shows "print" dialog for \a item.
 		//! \return true on success.
-		bool printItem(KexiPart::Item* item, const QString& titleText);
+		bool printItem(KexiPart::Item* item, const TQString& titleText);
 
 		//! Shows "print" dialog for \a item and \a settings.
 		//! \return true on success.
 		bool printItem(KexiPart::Item* item, const KexiSimplePrintingSettings& settings,
-			const QString& titleText = QString::null);
+			const TQString& titleText = TQString());
 		
 		/*! Shows "print preview" dialog for \a item. 
 		 The preview dialog is cached, so \a reload == true is sometimes needed 
 		 if data or print settings have changed in the meantime.
 		 \return true on success. */
-		bool printPreviewForItem(KexiPart::Item* item, const QString& titleText, 
+		bool printPreviewForItem(KexiPart::Item* item, const TQString& titleText, 
 			bool reload);
 
 		//! Shows "print preview" dialog. 
 		//! \return true on success.
 		bool printPreviewForItem(KexiPart::Item* item, const KexiSimplePrintingSettings& settings, 
-			const QString& titleText = QString::null, bool reload = false);
+			const TQString& titleText = TQString(), bool reload = false);
 
 		/*! Implemented for KexiMainWindow. Helper for printItem() and printPreviewForItem().
 		 Also used by KexiFormEventAction.