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

diff --git a/kexi/core/kexipartitem.h b/kexi/core/kexipartitem.h
index 46eebf47..c0b88d01 100644
--- a/kexi/core/kexipartitem.h
+++ b/kexi/core/kexipartitem.h
@@ -21,9 +21,9 @@
 #ifndef KEXIPROJECTPARTITEM_H
 #define KEXIPROJECTPARTITEM_H
 
-#include <qobject.h>
-#include <qintdict.h>
-#include <qptrlist.h>
+#include <tqobject.h>
+#include <tqintdict.h>
+#include <tqptrlist.h>
 
 namespace KexiDB
 {
@@ -53,17 +53,17 @@ class KEXICORE_EXPORT Item
 		int identifier() const { return m_id; }
 		void setIdentifier(int id) { m_id = id; }
 
-		QCString mimeType() const { return m_mime; }
-		void setMimeType(const QCString &mime) { m_mime = mime; }
+		TQCString mimeType() const { return m_mime; }
+		void setMimeType(const TQCString &mime) { m_mime = mime; }
 
-		QString name() const { return m_name; }
-		void setName(const QString &name) { m_name = name; }
+		TQString name() const { return m_name; }
+		void setName(const TQString &name) { m_name = name; }
 
-		QString caption() const { return m_caption; }
-		void setCaption(const QString &c) { m_caption = c; }
+		TQString caption() const { return m_caption; }
+		void setCaption(const TQString &c) { m_caption = c; }
 
-		QString description() const { return m_desc; }
-		void setDescription(const QString &d) { m_desc = d; }
+		TQString description() const { return m_desc; }
+		void setDescription(const TQString &d) { m_desc = d; }
 
 		/*! \return "neverSaved" flag for this item what mean 
 		 that is used when new item is created in-memory-only,
@@ -79,20 +79,20 @@ class KEXICORE_EXPORT Item
 		bool isNull() const { return m_id==0; }
 
 		//! \return caption if not empty, else returns name.
-		inline QString captionOrName() const { return m_caption.isEmpty() ? m_name : m_caption; }
+		inline TQString captionOrName() const { return m_caption.isEmpty() ? m_name : m_caption; }
 
 	private:
-		QCString m_mime;
-		QString m_name;
-		QString m_caption;
-		QString m_desc;
+		TQCString m_mime;
+		TQString m_name;
+		TQString m_caption;
+		TQString m_desc;
 		int m_id;
 		bool m_neverSaved : 1;
 };
 
-typedef QIntDict<KexiPart::Item> ItemDict;
-typedef QIntDictIterator<KexiPart::Item> ItemDictIterator;
-typedef QPtrListIterator<KexiPart::Item> ItemListIterator;
+typedef TQIntDict<KexiPart::Item> ItemDict;
+typedef TQIntDictIterator<KexiPart::Item> ItemDictIterator;
+typedef TQPtrListIterator<KexiPart::Item> ItemListIterator;
 
 /*! 
  @short Part item list with reimplemented compareItems() method.
@@ -100,12 +100,12 @@ typedef QPtrListIterator<KexiPart::Item> ItemListIterator;
  Such a list is returend by KexiProject::getSortedItems(KexiPart::ItemList& list, KexiPart::Info *i);
  so you can call sort() on the list to sort it by item name. 
 */
-class KEXICORE_EXPORT ItemList : public QPtrList<KexiPart::Item> {
+class KEXICORE_EXPORT ItemList : public TQPtrList<KexiPart::Item> {
 	public:
 		ItemList() {}
 	protected:
-		virtual int compareItems( QPtrCollection::Item item1, QPtrCollection::Item item2 ) {
-			return QString::compare(
+		virtual int compareItems( TQPtrCollection::Item item1, TQPtrCollection::Item item2 ) {
+			return TQString::compare(
 				static_cast<KexiPart::Item*>(item1)->name(), 
 				static_cast<KexiPart::Item*>(item2)->name());
 		}