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

diff --git a/kexi/widget/kexicharencodingcombobox.h b/kexi/widget/kexicharencodingcombobox.h
index 9af5a69f5..fd147cece 100644
--- a/kexi/widget/kexicharencodingcombobox.h
+++ b/kexi/widget/kexicharencodingcombobox.h
@@ -20,7 +20,7 @@
 #ifndef KEXICHARENCODINGCOMBO_H
 #define KEXICHARENCODINGCOMBO_H
 
-#include <qmap.h>
+#include <tqmap.h>
 #include <kcombobox.h>
 
 /*! @short Combobox widget providing a list of possible character encodings.
@@ -30,18 +30,18 @@ class KEXIEXTWIDGETS_EXPORT KexiCharacterEncodingComboBox : public KComboBox
 	public:
 		//! Constructs a new combobox. \a selectedEncoding can be provided to preselect encoding.
 		//! If it is not provided, default encoding is selected for current system settings.
-		KexiCharacterEncodingComboBox( QWidget* parent = 0, 
-			const QString& selectedEncoding = QString::null );
+		KexiCharacterEncodingComboBox( TQWidget* tqparent = 0, 
+			const TQString& selectedEncoding = TQString() );
 		~KexiCharacterEncodingComboBox();
 
-		QString selectedEncoding() const;
-		void setSelectedEncoding(const QString& encodingName);
+		TQString selectedEncoding() const;
+		void setSelectedEncoding(const TQString& encodingName);
 		//! Selects default encoding, if present
 		void selectDefaultEncoding();
 		bool defaultEncodingSelected() const;
 
 	protected:
-		QMap<QString,QString> m_encodingDescriptionForName;
+		TQMap<TQString,TQString> m_encodingDescriptionForName;
 		bool m_defaultEncodingAdded : 1;
 };