From f008adb5a77e094eaf6abf3fc0f36958e66896a5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 25 Jun 2011 05:28:35 +0000 Subject: 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 --- kexi/widget/kexicharencodingcombobox.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kexi/widget/kexicharencodingcombobox.h') 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 +#include #include /*! @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 m_encodingDescriptionForName; + TQMap m_encodingDescriptionForName; bool m_defaultEncodingAdded : 1; }; -- cgit v1.2.3