Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebindings@1157645 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

12 files changed, 225 insertions, 225 deletions

diff --git a/python/pykde/extra/kde321/configwidget.h b/python/pykde/extra/kde321/configwidget.h
index 643df88b..e289743a 100644
--- a/python/pykde/extra/kde321/configwidget.h
+++ b/python/pykde/extra/kde321/configwidget.h
@@ -26,7 +26,7 @@
 
 #include <kconfig.h>
 
-#include <qwidget.h>
+#include <tqwidget.h>
 
 namespace KRES {
 
@@ -34,7 +34,7 @@ class ConfigWidget : public QWidget
 {
     Q_OBJECT
   public:
-    ConfigWidget( QWidget *parent = 0, const char *name = 0 );
+    ConfigWidget( TQWidget *parent = 0, const char *name = 0 );
 
     /**
       Sets the widget to 'edit' mode. Reimplement this method if you are
diff --git a/python/pykde/extra/kde321/kaccelaction.h b/python/pykde/extra/kde321/kaccelaction.h
index 9967e4fc..83127675 100644
--- a/python/pykde/extra/kde321/kaccelaction.h
+++ b/python/pykde/extra/kde321/kaccelaction.h
@@ -20,10 +20,10 @@
 #ifndef _KACCELACTION_H
 #define _KACCELACTION_H
 
-#include <qmap.h>
-#include <qptrvector.h>
-#include <qstring.h>
-#include <qvaluevector.h>
+#include <tqmap.h>
+#include <tqptrvector.h>
+#include <tqstring.h>
+#include <tqvaluevector.h>
 
 #include <kshortcut.h>
 
@@ -97,9 +97,9 @@ class KAccelAction
 	 * @param bConfigurable if true the user can configure the shortcut
 	 * @param bEnabled true if the accelerator should be enabled
 	 */
-	KAccelAction( const QString& sName, const QString& sLabel, const QString& sWhatsThis,
+	KAccelAction( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
 			const KShortcut& cutDef3, const KShortcut& cutDef4,
-			const QObject* pObjSlot, const char* psMethodSlot,
+			const TQObject* pObjSlot, const char* psMethodSlot,
 			bool bConfigurable, bool bEnabled );
 	~KAccelAction();
 
@@ -123,9 +123,9 @@ class KAccelAction
 	 * @param bEnabled true if the accelerator should be enabled
 	 * @return true if successful, false otherwise
 	 */
-	bool init( const QString& sName, const QString& sLabel, const QString& sWhatsThis,
+	bool init( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
 			const KShortcut& cutDef3, const KShortcut& cutDef4,
-			const QObject* pObjSlot, const char* psMethodSlot,
+			const TQObject* pObjSlot, const char* psMethodSlot,
 			bool bConfigurable, bool bEnabled );
 
 	/**
@@ -138,21 +138,21 @@ class KAccelAction
 	 * @return the name of the accelerator action, can be null if not 
 	 *         set
 	 */
-	const QString& name() const                { return m_sName; }
+	const TQString& name() const                { return m_sName; }
 
 	/**
 	 * Returns the label of the accelerator action.
 	 * @return the label of the accelerator action, can be null if
 	 *         not set
 	 */
-	const QString& label() const               { return m_sLabel; }
+	const TQString& label() const               { return m_sLabel; }
 
 	/**
 	 * Returns the What's This text of the accelerator action.
 	 * @return the What's This text of the accelerator action, can be
 	 *         null if not set
 	 */
-	const QString& whatsThis() const           { return m_sWhatsThis; }
+	const TQString& whatsThis() const           { return m_sWhatsThis; }
 	
 	/**
 	 * The shortcut that is actually used (may be used configured).
@@ -194,7 +194,7 @@ class KAccelAction
 	 * Returns the receiver of signals.
 	 * @return the receiver of signals (can be 0 if not set)
 	 */
-	const QObject* objSlotPtr() const          { return m_pObjSlot; }
+	const TQObject* objSlotPtr() const          { return m_pObjSlot; }
 
 	/**
 	 * Returns the slot for the signal.
@@ -218,19 +218,19 @@ class KAccelAction
 	 * Sets the name of the accelerator action.
 	 * @param name the new name
 	 */
-	void setName( const QString& name );
+	void setName( const TQString& name );
 
 	/**
 	 * Sets the user-readable label of the accelerator action.
 	 * @param label the new label (i18n!)
 	 */
-	void setLabel( const QString& label );
+	void setLabel( const TQString& label );
 
 	/**
 	 * Sets the What's This text for the accelerator action.
 	 * @param whatsThis the new What's This text (i18n!)
 	 */
-	void setWhatsThis( const QString& whatsThis );
+	void setWhatsThis( const TQString& whatsThis );
 
 	/**
 	 * Sets the new shortcut of the accelerator action.
@@ -244,7 +244,7 @@ class KAccelAction
 	 * @param pObjSlot the receiver object of the signal
 	 * @param psMethodSlot the slot for the signal
 	 */
-	void setSlot( const QObject* pObjSlot, const char* psMethodSlot );
+	void setSlot( const TQObject* pObjSlot, const char* psMethodSlot );
 
 	/**
 	 * Enables or disabled configuring the action.
@@ -308,12 +308,12 @@ class KAccelAction
 	 * @return the string representation of the action's shortcut.
 	 * @see KShortcut::toString()
 	 */
-	QString toString() const;
+	TQString toString() const;
 
 	/**
 	 * @internal
 	 */
-	QString toStringInternal() const;
+	TQString toStringInternal() const;
 
 	/**
 	 * Returns true if four modifier keys will be used.
@@ -329,12 +329,12 @@ class KAccelAction
 	static void useFourModifierKeys( bool use );
 
  protected:
-	QString m_sName,
+	TQString m_sName,
 	        m_sLabel,
 	        m_sWhatsThis;
 	KShortcut m_cut;
 	KShortcut m_cutDefault3, m_cutDefault4;
-	const QObject* m_pObjSlot;
+	const TQObject* m_pObjSlot;
 	const char* m_psMethodSlot;
 	bool m_bConfigurable,
 	     m_bEnabled;
@@ -397,7 +397,7 @@ class KAccelActions
 	 * @param sGroup the group in the configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool init( KConfigBase& config, const QString& sGroup );
+	bool init( KConfigBase& config, const TQString& sGroup );
 
 	/**
 	 * Updates the shortcuts of all actions in this object
@@ -412,7 +412,7 @@ class KAccelActions
 	 * @param sAction the action to search
 	 * @return the index of the action, or -1 if not found
 	 */
-	int actionIndex( const QString& sAction ) const;
+	int actionIndex( const TQString& sAction ) const;
 
 	/**
 	 * Returns the action with the given @p index.
@@ -438,7 +438,7 @@ class KAccelActions
 	 * @return the KAccelAction with the given name, or 0
 	 *          if not found
 	 */
-	KAccelAction* actionPtr( const QString& sAction );
+	KAccelAction* actionPtr( const TQString& sAction );
 
 	/**
 	 * Returns the action with the given name.
@@ -446,7 +446,7 @@ class KAccelActions
 	 * @return the KAccelAction with the given name, or 0
 	 *          if not found
 	 */
-	const KAccelAction* actionPtr( const QString& sAction ) const;
+	const KAccelAction* actionPtr( const TQString& sAction ) const;
 
 	/**
 	 * Returns the action with the given key sequence.
@@ -491,9 +491,9 @@ class KAccelActions
 	 * @param bEnabled true if the accelerator should be enabled
 	 * @return the new action
 	 */
-	KAccelAction* insert( const QString& sAction, const QString& sLabel, const QString& sWhatsThis,
+	KAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
 			const KShortcut& rgCutDefaults3, const KShortcut& rgCutDefaults4,
-			const QObject* pObjSlot = 0, const char* psMethodSlot = 0,
+			const TQObject* pObjSlot = 0, const char* psMethodSlot = 0,
 			bool bConfigurable = true, bool bEnabled = true );
 
 	/**
@@ -502,14 +502,14 @@ class KAccelActions
 	 * @param sLabel the label of the accelerator (i18n!)
 	 * @return the new action
 	 */
-	KAccelAction* insert( const QString& sName, const QString& sLabel );
+	KAccelAction* insert( const TQString& sName, const TQString& sLabel );
 
 	/**
 	 * Removes the given action.
 	 * @param sAction the name of the action.
 	 * @return true if successful, false otherwise
 	 */
-	bool remove( const QString& sAction );
+	bool remove( const TQString& sAction );
 
 	/**
 	 * Loads the actions from the given configuration file.
@@ -518,7 +518,7 @@ class KAccelActions
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	bool readActions( const QString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the actions to the given configuration file.
@@ -529,7 +529,7 @@ class KAccelActions
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeActions( const QString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	/**
diff --git a/python/pykde/extra/kde321/kaccelbase.h b/python/pykde/extra/kde321/kaccelbase.h
index 3ddce3ac..7cdbb618 100644
--- a/python/pykde/extra/kde321/kaccelbase.h
+++ b/python/pykde/extra/kde321/kaccelbase.h
@@ -20,11 +20,11 @@
 #ifndef _KACCELBASE_H
 #define _KACCELBASE_H
 
-#include <qmap.h>
-#include <qptrvector.h>
-#include <qstring.h>
-#include <qvaluevector.h>
-#include <qvaluelist.h>
+#include <tqmap.h>
+#include <tqptrvector.h>
+#include <tqstring.h>
+#include <tqvaluevector.h>
+#include <tqvaluelist.h>
 
 #include "kaccelaction.h"
 #include "kkeyserver_x11.h"
@@ -79,11 +79,11 @@ class QWidget;
  * a->insertItem( i18n("Scroll Up"), "Scroll Up", "Up" );
  * // Insert an action "Scroll Down" which is not associated with any key:
  * a->insertItem( i18n("Scroll Down"), "Scroll Down", 0);
- * a->connectItem( "Scroll up", myWindow, SLOT( scrollUp() ) );
+ * a->connectItem( "Scroll up", myWindow, TQT_SLOT( scrollUp() ) );
  * // a->insertStdItem( KStdAccel::Print ); //not necessary, since it
  *	// is done automatially with the
  *	// connect below!
- * a->connectItem(KStdAccel::Print, myWindow, SLOT( printDoc() ) );
+ * a->connectItem(KStdAccel::Print, myWindow, TQT_SLOT( printDoc() ) );
  *
  * a->readSettings();
  *\endcode
@@ -93,12 +93,12 @@ class QWidget;
  *
  * \code
  * int id;
- * id = popup->insertItem("&Print",this, SLOT(printDoc()));
+ * id = popup->insertItem("&Print",this, TQT_SLOT(printDoc()));
  * a->changeMenuAccel(popup, id, KStdAccel::Print );
  * \endcode
  *
  * If you want a somewhat "exotic" name for your standard print action, like
- *   id = popup->insertItem(i18n("Print &Document"),this, SLOT(printDoc()));
+ *   id = popup->insertItem(i18n("Print &Document"),this, TQT_SLOT(printDoc()));
  * it might be a good idea to insert the standard action before as
  *          a->insertStdItem( KStdAccel::Print, i18n("Print Document") )
  * as well, so that the user can easily find the corresponding function.
@@ -107,7 +107,7 @@ class QWidget;
  * in a menu could be done with
  *
  * \code
- *    id = popup->insertItem(i18n"Scroll &up",this, SLOT(scrollUp()));
+ *    id = popup->insertItem(i18n"Scroll &up",this, TQT_SLOT(scrollUp()));
  *    a->changeMenuAccel(popup, id, "Scroll Up" );
  * \endcode
  *
@@ -132,13 +132,13 @@ class KAccelBase
 	KAccelActions& actions();
 	bool isEnabled() const;
 
-	KAccelAction* actionPtr( const QString& sAction );
-	const KAccelAction* actionPtr( const QString& sAction ) const;
+	KAccelAction* actionPtr( const TQString& sAction );
+	const KAccelAction* actionPtr( const TQString& sAction ) const;
 	KAccelAction* actionPtr( const KKey& key );
 	KAccelAction* actionPtr( const KKeyServer::Key& key );
 
-	const QString& configGroup() const { return m_sConfigGroup; }
-	void setConfigGroup( const QString& group );
+	const TQString& configGroup() const { return m_sConfigGroup; }
+	void setConfigGroup( const TQString& group );
 	void setConfigGlobal( bool global );
 	virtual void setEnabled( bool bEnabled ) = 0;
 	bool getAutoUpdate() { return m_bAutoUpdate; }
@@ -148,21 +148,21 @@ class KAccelBase
 // Procedures for manipulating Actions.
 	//void clearActions();
 
-	KAccelAction* insert( const QString& sName, const QString& sDesc );
+	KAccelAction* insert( const TQString& sName, const TQString& sDesc );
 	KAccelAction* insert(
-	                 const QString& sAction, const QString& sDesc, const QString& sHelp,
+	                 const TQString& sAction, const TQString& sDesc, const TQString& sHelp,
 	                 const KShortcut& rgCutDefaults3, const KShortcut& rgCutDefaults4,
-	                 const QObject* pObjSlot, const char* psMethodSlot,
+	                 const TQObject* pObjSlot, const char* psMethodSlot,
 			 bool bConfigurable = true, bool bEnabled = true );
-	bool remove( const QString& sAction );
-	bool setActionSlot( const QString& sAction, const QObject* pObjSlot, const char* psMethodSlot );
+	bool remove( const TQString& sAction );
+	bool setActionSlot( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot );
 
 	bool updateConnections();
 
-	bool setShortcut( const QString& sAction, const KShortcut& cut );
+	bool setShortcut( const TQString& sAction, const KShortcut& cut );
 
 // Modify individual Action sub-items
-	bool setActionEnabled( const QString& sAction, bool bEnable );
+	bool setActionEnabled( const TQString& sAction, bool bEnable );
 
 	/**
 	 * Read all key associations from @p config, or (if @p config
@@ -181,14 +181,14 @@ class KAccelBase
 	 */
 	void writeSettings( KConfigBase* pConfig = 0 ) const;
 
-	QPopupMenu* createPopupMenu( QWidget* pParent, const KKeySequence& );
+	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
  // Protected methods
  protected:
 	void slotRemoveAction( KAccelAction* );
 
 	struct X;
-	void createKeyList( QValueVector<struct X>& rgKeys );
+	void createKeyList( TQValueVector<struct X>& rgKeys );
 	bool insertConnection( KAccelAction* );
 	bool removeConnection( KAccelAction* );
 
@@ -209,15 +209,15 @@ class KAccelBase
 		ActionInfo( KAccelAction* _pAction, uint _iSeq, uint _iVariation )
 			{ pAction = _pAction; iSeq = _iSeq; iVariation = _iVariation; }
 	};
-	typedef QMap<KKeyServer::Key, ActionInfo> KKeyToActionMap;
+	typedef TQMap<KKeyServer::Key, ActionInfo> KKeyToActionMap;
 
 	KAccelActions m_rgActions;
 	KKeyToActionMap m_mapKeyToAction;
-	QValueList<KAccelAction*> m_rgActionsNonUnique;
+	TQValueList<KAccelAction*> m_rgActionsNonUnique;
 	bool m_bNativeKeys; // Use native key codes instead of Qt codes
 	bool m_bEnabled;
 	bool m_bConfigIsGlobal;
-	QString m_sConfigGroup;
+	TQString m_sConfigGroup;
 	bool m_bAutoUpdate;
 	KAccelAction* mtemp_pActionRemoving;
 
diff --git a/python/pykde/extra/kde321/kicontheme.h b/python/pykde/extra/kde321/kicontheme.h
index a360a15d..4c15c2d9 100644
--- a/python/pykde/extra/kde321/kicontheme.h
+++ b/python/pykde/extra/kde321/kicontheme.h
@@ -15,9 +15,9 @@
 #ifndef __KIconTheme_h_Included__
 #define __KIconTheme_h_Included__
 
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qptrlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqptrlist.h>
 
 class KConfig;
 //class KIconThemeDir;
@@ -141,7 +141,7 @@ public:
     /**
      * The full path of the icon.
      */
-    QString path;
+    TQString path;
 
 private:
     KIconPrivate *d;
@@ -164,71 +164,71 @@ public:
      * @param appName the name of the application. Can be null. This argument
      *        allows applications to have themed application icons.
      */
-    KIconTheme(const QString& name, const QString& appName=QString::null);
+    KIconTheme(const TQString& name, const TQString& appName=TQString::null);
     ~KIconTheme();
 
     /**
      * The stylized name of the icon theme.
      * @return the (human-readable) name of the theme
      */
-    QString name() const { return mName; }
+    TQString name() const { return mName; }
 
     /**
      * A description for the icon theme.
-     * @return a human-readable description of the theme, QString::null
+     * @return a human-readable description of the theme, TQString::null
      *         if there is none
      */
-    QString description() const { return mDesc; }
+    TQString description() const { return mDesc; }
 
     /**
      * Return the name of the "example" icon. This can be used to
      * present the theme to the user.
-     * @return the name of the example icon, QString::null if there is none
+     * @return the name of the example icon, TQString::null if there is none
      */
-    QString example() const;
+    TQString example() const;
 
     /**
      * Return the name of the screenshot.
-     * @return the name of the screenshot, QString::null if there is none
+     * @return the name of the screenshot, TQString::null if there is none
      */
-    QString screenshot() const;
+    TQString screenshot() const;
 
     /**
      * Returns the name of this theme's link overlay.
      * @return the name of the link overlay
      */
-    QString linkOverlay() const;
+    TQString linkOverlay() const;
 
     /**
      * Returns the name of this theme's zip overlay.
      * @return the name of the zip overlay
      */
-    QString zipOverlay() const;
+    TQString zipOverlay() const;
 
     /**
      * Returns the name of this theme's lock overlay.
      * @return the name of the lock overlay
      */
-    QString lockOverlay() const;
+    TQString lockOverlay() const;
 
     /**
      * Returns the name of this theme's share overlay.
      * @return the name of the share overlay
      * @since 3.1
      */
-    QString shareOverlay () const;
+    TQString shareOverlay () const;
 
     /**
      * Returns the toplevel theme directory.
      * @return the directory of the theme
      */
-    QString dir() const { return mDir; }
+    TQString dir() const { return mDir; }
 
     /**
      * The themes this icon theme falls back on.
      * @return a list of icon themes that are used as fall-backs
      */
-    QStringList inherits() const { return mInherits; }
+    TQStringList inherits() const { return mInherits; }
 
     /**
      * The icon theme exists?
@@ -262,7 +262,7 @@ public:
      * @param group The icon group. See KIcon::Group.
      * @return a list of available sized for the given group
      */
-    QValueList<int> querySizes(KIcon::Group group) const;
+    TQValueList<int> querySizes(KIcon::Group group) const;
 
     /**
      * Query available icons for a size and context.
@@ -270,7 +270,7 @@ public:
      * @param context the context of the icons
      * @return the list of icon names
      */
-    QStringList queryIcons(int size, KIcon::Context context = KIcon::Any) const;
+    TQStringList queryIcons(int size, KIcon::Context context = KIcon::Any) const;
 
     /**
      * Query available icons for a context and preferred size.
@@ -278,7 +278,7 @@ public:
      * @param context the context of the icons
      * @return the list of icon names
      */
-    QStringList queryIconsByContext(int size, KIcon::Context context = KIcon::Any) const;
+    TQStringList queryIconsByContext(int size, KIcon::Context context = KIcon::Any) const;
 
 
     /**
@@ -291,19 +291,19 @@ public:
      * @return A KIcon class that describes the icon. If an icon is found,
      * @see KIcon::isValid will return true, and false otherwise.
      */
-    KIcon iconPath(const QString& name, int size, KIcon::MatchType match) const;
+    KIcon iconPath(const TQString& name, int size, KIcon::MatchType match) const;
 
     /**
      * List all icon themes installed on the system, global and local.
      * @return the list of all icon themes
      */
-    static QStringList list();
+    static TQStringList list();
 
     /**
      * Returns the current icon theme.
      * @return the name of the current theme
      */
-    static QString current();
+    static TQString current();
 
     /**
      * Reconfigure the theme.
@@ -315,20 +315,20 @@ public:
      * @return the name of the default theme name
      * @since 3.1
      */
-    static QString defaultThemeName();
+    static TQString defaultThemeName();
 
 private:
     int mDefSize[8];
-    QValueList<int> mSizes[8];
+    TQValueList<int> mSizes[8];
 
     int mDepth;
-    QString mDir, mName, mDesc;
-    QStringList mInherits;
-//    QPtrList<KIconThemeDir> mDirs;
+    TQString mDir, mName, mDesc;
+    TQStringList mInherits;
+//    TQPtrList<KIconThemeDir> mDirs;
     KIconThemePrivate *d;
 
-    static QString *_theme;
-    static QStringList *_theme_list;
+    static TQString *_theme;
+    static TQStringList *_theme_list;
 };
 
 #endif
diff --git a/python/pykde/extra/kde321/kkeyserver_x11.h b/python/pykde/extra/kde321/kkeyserver_x11.h
index cf1b360a..1271f506 100644
--- a/python/pykde/extra/kde321/kkeyserver_x11.h
+++ b/python/pykde/extra/kde321/kkeyserver_x11.h
@@ -42,7 +42,7 @@ namespace KKeyServer
 		 * @param s the description of the symbol
 		 * @see toString()
 		 */
-		Sym( const QString& s )
+		Sym( const TQString& s )
 			{ init( s ); }
 
 		/**
@@ -59,7 +59,7 @@ namespace KKeyServer
 		 * @return true if successful, false otherwise
 		 * @see toString()
 		 */
-		bool init( const QString &s );
+		bool init( const TQString &s );
 
 		/**
 		 * Returns the qt key code of the symbol.
@@ -70,13 +70,13 @@ namespace KKeyServer
 		/**
 		 * @internal
 		 */
-		QString toStringInternal() const;
+		TQString toStringInternal() const;
 
 		/**
 		 * Returns the string representation of the symbol.
 		 * @return the string representation of the symbol
 		 */
-		QString toString() const;
+		TQString toString() const;
 
 		/**
 		 * Returns the mods that are required for this symbol as
@@ -103,9 +103,9 @@ namespace KKeyServer
 		Sym& operator =( uint sym ) { m_sym = sym; return *this; }
 
 	 private:
-		QString toString( bool bUserSpace ) const;
+		TQString toString( bool bUserSpace ) const;
 
-		static void capitalizeKeyname( QString& );
+		static void capitalizeKeyname( TQString& );
 	};
 
 	/**
@@ -407,7 +407,7 @@ namespace KKeyServer
 	/**
 	 * @internal
 	 */
-	QString modToStringInternal( uint mod );
+	TQString modToStringInternal( uint mod );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to a
@@ -415,13 +415,13 @@ namespace KKeyServer
 	 * @param mod the mask of ORed KKey::ModFlag modifiers
 	 * @return the user-readable string
 	 */
-	QString modToStringUser( uint mod );
+	TQString modToStringUser( uint mod );
 
 	/**
 	 * @internal
 	 * Unimplemented?
 	 */
-	bool stringToSymMod( const QString&, uint& sym, uint& mod );
+	bool stringToSymMod( const TQString&, uint& sym, uint& mod );
 
 	/**
 	 * @internal
diff --git a/python/pykde/extra/kde321/konsole_part.h b/python/pykde/extra/kde321/konsole_part.h
index ba89800b..00560d6e 100644
--- a/python/pykde/extra/kde321/konsole_part.h
+++ b/python/pykde/extra/kde321/konsole_part.h
@@ -51,10 +51,10 @@ public:
     konsoleFactory();
     virtual ~konsoleFactory();
 
-    virtual KParts::Part* createPartObject(QWidget *parentWidget = 0, const char *widgetName = 0,
-                                     QObject* parent = 0, const char* name = 0,
+    virtual KParts::Part* createPartObject(TQWidget *parentWidget = 0, const char *widgetName = 0,
+                                     TQObject* parent = 0, const char* name = 0,
                                      const char* classname = "KParts::Part",
-                                     const QStringList &args = QStringList());
+                                     const TQStringList &args = TQStringList());
 
     static KInstance *instance();
 
@@ -69,12 +69,12 @@ class konsolePart: public KParts::ReadOnlyPart, public TerminalInterface
 {
     Q_OBJECT
 	public:
-    konsolePart(QWidget *parentWidget, const char *widgetName, QObject * parent, const char *name, const char *classname = 0);
+    konsolePart(TQWidget *parentWidget, const char *widgetName, TQObject * parent, const char *name, const char *classname = 0);
     virtual ~konsolePart();
 
 signals:
     void processExited();
-    void receivedData( const QString& s );
+    void receivedData( const TQString& s );
  protected:
     virtual bool openURL( const KURL & url );
     virtual bool openFile() {return false;} // never used
@@ -84,7 +84,7 @@ signals:
  protected slots:
     void showShell();
     void slotProcessExited();
-    void slotReceivedData( const QString& s );
+    void slotReceivedData( const TQString& s );
 
 //    void doneSession(TESession*);
     void sessionDestroyed();
@@ -93,7 +93,7 @@ signals:
     void enableMasterModeConnections();
 
  private slots:
-    void emitOpenURLRequest(const QString &url);
+    void emitOpenURLRequest(const TQString &url);
 
     void readProperties();
     void saveProperties();
@@ -130,11 +130,11 @@ signals:
 //    void setSchema(ColorSchema* s);
     void updateKeytabMenu();
 
-	bool doOpenStream( const QString& );
-	bool doWriteStream( const QByteArray& );
+	bool doOpenStream( const TQString& );
+	bool doWriteStream( const TQByteArray& );
 	bool doCloseStream();
 
-    QWidget* parentWidget;
+    TQWidget* parentWidget;
 //    TEWidget* te;
 //    TESession* se;
 //    ColorSchemaList* colors;
@@ -154,13 +154,13 @@ signals:
     KPopupMenu* m_options;
     KPopupMenu* m_popupMenu;
 
-    QFont       defaultFont;
+    TQFont       defaultFont;
 
-    QString     pmPath; // pixmap path
-    QString     s_schema;
-    QString     s_kconfigSchema;
-    QString     s_word_seps;			// characters that are considered part of a word
-    QString     fontNotFound_par;
+    TQString     pmPath; // pixmap path
+    TQString     s_schema;
+    TQString     s_kconfigSchema;
+    TQString     s_word_seps;			// characters that are considered part of a word
+    TQString     fontNotFound_par;
 
     bool        b_framevis:1;
     bool        b_histEnabled:1;
@@ -177,10 +177,10 @@ signals:
 public:
     // these are the implementations for the TermEmuInterface
     // functions...
-    void startProgram( const QString& program,
-                       const QStrList& args );
-    void showShellInDir( const QString& dir );
-    void sendInput( const QString& text );
+    void startProgram( const TQString& program,
+                       const TQStrList& args );
+    void showShellInDir( const TQString& dir );
+    void sendInput( const TQString& text );
 };
 
 //////////////////////////////////////////////////////////////////////
@@ -191,7 +191,7 @@ public:
 public:
   HistoryTypeDialog(const HistoryType& histType,
                     unsigned int histSize,
-                    QWidget *parent);
+                    TQWidget *parent);
 
 public slots:
   void slotDefault();
@@ -202,9 +202,9 @@ public slots:
   bool isOn() const;
 
 protected:
-  QCheckBox* m_btnEnable;
-  QSpinBox*  m_size;
-  QPushButton* m_setUnlimited;
+  TQCheckBox* m_btnEnable;
+  TQSpinBox*  m_size;
+  TQPushButton* m_setUnlimited;
 };*/
 
 //////////////////////////////////////////////////////////////////////
diff --git a/python/pykde/extra/kde321/kpanelmenu.h b/python/pykde/extra/kde321/kpanelmenu.h
index 83c32680..1803e808 100644
--- a/python/pykde/extra/kde321/kpanelmenu.h
+++ b/python/pykde/extra/kde321/kpanelmenu.h
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __KPANELMENU_H__
 #define __KPANELMENU_H__
 
-#include <qstring.h>
+#include <tqstring.h>
 #include <kpopupmenu.h>
 #include <kgenericfactory.h>
 
@@ -60,31 +60,31 @@ public:
      * Construct a KPanelMenu object. This is the normal constructor to use when
      * building extrernal menu entries.
      */
-    KPanelMenu(QWidget *parent=0, const char *name=0);
+    KPanelMenu(TQWidget *parent=0, const char *name=0);
     /**
      * Constructor used internally by Kicker. You don't really want to use it.
      * @param startDir a directory to associate with this menu
      * @see path(), setPath()
      */
-    KPanelMenu(const QString &startDir, QWidget *parent=0, const char *name=0);
+    KPanelMenu(const TQString &startDir, TQWidget *parent=0, const char *name=0);
     /**
      * Destructor.
      */
     virtual ~KPanelMenu();
 
     /**
-     * Get the directory path associated with this menu, or QString::null if
+     * Get the directory path associated with this menu, or TQString::null if
      * there's no such associated path.
      * @return the associated directory path
      * @see setPath()
      */
-    const QString& path() const;
+    const TQString& path() const;
     /**
      * Set a directory path to be associated with this menu.
      * @param p the directory path
      * @see path()
      */
-    void setPath(const QString &p);
+    void setPath(const TQString &p);
     /**
      * Tell if the menu has been initialized, that is it already contains items.
      * This is useful when you need to know if you have to clear the menu, or to
@@ -160,11 +160,11 @@ protected:
     /**
      * Re-implemented for internal reasons.
      */
-    virtual void hideEvent(QHideEvent *ev);
+    virtual void hideEvent(TQHideEvent *ev);
     /**
      * For internal use only. Used by constructors.
      */
-    void init(const QString& path = QString::null);
+    void init(const TQString& path = TQString::null);
 
 protected:
     virtual void virtual_hook( int id, void* data );
diff --git a/python/pykde/extra/kde321/krecentdirs.h b/python/pykde/extra/kde321/krecentdirs.h
index 71f771b1..61a50706 100644
--- a/python/pykde/extra/kde321/krecentdirs.h
+++ b/python/pykde/extra/kde321/krecentdirs.h
@@ -28,7 +28,7 @@
 #ifndef __KRECENTDIRS_H
 #define __KRECENTDIRS_H
 
-#include <qstringlist.h>
+#include <tqstringlist.h>
 
 /**
  * The goal of this class is to make sure that, when the user needs to 
@@ -52,17 +52,17 @@ public:
      * Returns a list of directories associated with this file-class.
      * The most recently used directory is at the front of the list.
      */
-    static QStringList list(const QString &fileClass);
+    static TQStringList list(const TQString &fileClass);
     
     /**
      * Returns the most recently used directory accociated with this file-class.
      */
-    static QString dir(const QString &fileClass);
+    static TQString dir(const TQString &fileClass);
     
     /**
      * Associates @p directory with @p fileClass
      */
-    static void add(const QString &fileClass, const QString &directory);
+    static void add(const TQString &fileClass, const TQString &directory);
 };
 
 #endif
diff --git a/python/pykde/extra/kde321/ksycocafactory.h b/python/pykde/extra/kde321/ksycocafactory.h
index 9cc12570..1ecd5d82 100644
--- a/python/pykde/extra/kde321/ksycocafactory.h
+++ b/python/pykde/extra/kde321/ksycocafactory.h
@@ -22,15 +22,15 @@
 #include "ksycocatype.h"
 #include "ksycocaentry.h"
 
-#include <qdict.h>
-#include <qptrlist.h>
+#include <tqdict.h>
+#include <tqptrlist.h>
 class KSycoca;
 class QStringList;
 class QString;
 class KSycocaDict;
 class KSycocaResourceList;
 
-typedef QDict<KSycocaEntry::Ptr> KSycocaEntryDict;
+typedef TQDict<KSycocaEntry::Ptr> KSycocaEntryDict;
 
 /**
  * @internal
@@ -65,7 +65,7 @@ public:
     * Construct an entry from a config file.
     * To be implemented in the real factories.
     */
-   virtual KSycocaEntry *createEntry(const QString &file, const char *resource) = 0;
+   virtual KSycocaEntry *createEntry(const TQString &file, const char *resource) = 0;
 
    /**
     * Add an entry
@@ -99,7 +99,7 @@ public:
     * Don't forget to call the parent first when you override 
     * this function.
     */
-   virtual void save(QDataStream &str);
+   virtual void save(TQDataStream &str);
 
    /**
     * Writes out a header to the stream 'str'.
@@ -108,7 +108,7 @@ public:
     * Don't forget to call the parent first when you override 
     * this function.
     */
-   virtual void saveHeader(QDataStream &str);
+   virtual void saveHeader(TQDataStream &str);
 
    /**
     * @return the resources for which this factory is responsible.
@@ -122,7 +122,7 @@ protected:
    int m_sycocaDictOffset;
    int m_beginEntryOffset;
    int m_endEntryOffset;
-   QDataStream *m_str;
+   TQDataStream *m_str;
 
    KSycocaResourceList *m_resourceList;
    KSycocaEntryDict *m_entryDict;
@@ -134,7 +134,7 @@ protected:
 /** This, instead of a typedef, allows to declare "class ..." in header files
  * @internal
  */
-class KSycocaFactoryList : public QPtrList<KSycocaFactory>
+class KSycocaFactoryList : public TQPtrList<KSycocaFactory>
 {
 public:
    KSycocaFactoryList() { }
diff --git a/python/pykde/extra/kde321/ktoolbarbutton.h b/python/pykde/extra/kde321/ktoolbarbutton.h
index 065617ae..e2c5f5d7 100644
--- a/python/pykde/extra/kde321/ktoolbarbutton.h
+++ b/python/pykde/extra/kde321/ktoolbarbutton.h
@@ -24,10 +24,10 @@
 #ifndef _KTOOLBARBUTTON_H
 #define _KTOOLBARBUTTON_H
 
-#include <qpixmap.h>
-#include <qtoolbutton.h>
-#include <qintdict.h>
-#include <qstring.h>
+#include <tqpixmap.h>
+#include <tqtoolbutton.h>
+#include <tqintdict.h>
+#include <tqstring.h>
 #include <kglobal.h>
 
 class KToolBar;
@@ -58,8 +58,8 @@ public:
    * @param name   This button's internal name
    * @param txt    This button's text (in a tooltip or otherwise)
    */
-  KToolBarButton(const QString& icon, int id, QWidget *parent,
-                 const char *name=0L, const QString &txt=QString::null,
+  KToolBarButton(const TQString& icon, int id, TQWidget *parent,
+                 const char *name=0L, const TQString &txt=TQString::null,
                  KInstance *_instance = KGlobal::instance());
 
   /**
@@ -73,8 +73,8 @@ public:
    * @param name   This button's internal name
    * @param txt    This button's text (in a tooltip or otherwise)
    */
-  KToolBarButton(const QPixmap& pixmap, int id, QWidget *parent,
-                 const char *name=0L, const QString &txt=QString::null);
+  KToolBarButton(const TQPixmap& pixmap, int id, TQWidget *parent,
+                 const char *name=0L, const TQString &txt=TQString::null);
 
   /**
    * Construct a separator button
@@ -82,7 +82,7 @@ public:
    * @param parent This button's parent
    * @param name   This button's internal name
    */
-  KToolBarButton(QWidget *parent=0L, const char *name=0L);
+  KToolBarButton(TQWidget *parent=0L, const char *name=0L);
 
   /**
    * Standard destructor
@@ -99,8 +99,8 @@ public:
    *
    * @param pixmap The active pixmap
    */
-  // this one is from QButton, so #ifdef-ing it out doesn't break BC
-  virtual void setPixmap(const QPixmap &pixmap) KDE_DEPRECATED;
+  // this one is from TQButton, so #ifdef-ing it out doesn't break BC
+  virtual void setPixmap(const TQPixmap &pixmap) KDE_DEPRECATED;
 
   /**
    * @deprecated
@@ -109,7 +109,7 @@ public:
    *
    * @param pixmap The pixmap to use as the default (normal) one
    */
-  void setDefaultPixmap(const QPixmap& pixmap) KDE_DEPRECATED;
+  void setDefaultPixmap(const TQPixmap& pixmap) KDE_DEPRECATED;
 
   /**
    * @deprecated
@@ -118,7 +118,7 @@ public:
    *
    * @param pixmap The pixmap to use when disabled
    */
-  void setDisabledPixmap(const QPixmap& pixmap) KDE_DEPRECATED;
+  void setDisabledPixmap(const TQPixmap& pixmap) KDE_DEPRECATED;
 #endif
 
   /**
@@ -127,7 +127,7 @@ public:
    *
    * @param text The button (or tooltip) text
    */
-  virtual void setText(const QString &text);
+  virtual void setText(const TQString &text);
 
   /**
    * Set the icon for this button. The icon will be loaded internally
@@ -135,19 +135,19 @@ public:
    *
    * @param icon The name of the icon
    */
-  virtual void setIcon(const QString &icon);
+  virtual void setIcon(const TQString &icon);
 
   /// @since 3.1
-  virtual void setIcon( const QPixmap &pixmap )
-  { QToolButton::setIcon( pixmap ); }
+  virtual void setIcon( const TQPixmap &pixmap )
+  { TQToolButton::setIcon( pixmap ); }
 
   /**
-   * Set the pixmaps for this toolbar button from a QIconSet.
+   * Set the pixmaps for this toolbar button from a TQIconSet.
    * If you call this you don't need to call any of the other methods
    * that set icons or pixmaps.
    * @param iconset  The iconset to use
    */
-  virtual void setIconSet( const QIconSet &iconset );
+  virtual void setIconSet( const TQIconSet &iconset );
 
 #ifndef KDE_NO_COMPAT
   /**
@@ -161,7 +161,7 @@ public:
    * @param generate If true, then the other icons are automagically
    *                 generated from this one
    */
-  KDE_DEPRECATED void setIcon(const QString &icon, bool generate ) { Q_UNUSED(generate); setIcon( icon ); }
+  KDE_DEPRECATED void setIcon(const TQString &icon, bool generate ) { Q_UNUSED(generate); setIcon( icon ); }
 
   /**
    * @deprecated
@@ -170,7 +170,7 @@ public:
    *
    * @param icon The icon to use as the default (normal) one
    */
-  void setDefaultIcon(const QString& icon) KDE_DEPRECATED;
+  void setDefaultIcon(const TQString& icon) KDE_DEPRECATED;
 
   /**
    * @deprecated
@@ -179,7 +179,7 @@ public:
    *
    * @param icon The icon to use when disabled
    */
-  void setDisabledIcon(const QString& icon) KDE_DEPRECATED;
+  void setDisabledIcon(const TQString& icon) KDE_DEPRECATED;
 #endif
 
   /**
@@ -206,7 +206,7 @@ public:
   /**
    * Return a pointer to this button's popup menu (if it exists)
    */
-  QPopupMenu *popup();
+  TQPopupMenu *popup();
 
   /**
    * Returns the button's id.
@@ -222,7 +222,7 @@ public:
    * @param p The new popup menu
    * @param unused Has no effect - ignore it.
    */
-  void setPopup (QPopupMenu *p, bool unused = false);
+  void setPopup (TQPopupMenu *p, bool unused = false);
 
   /**
    * Gives this button a delayed popup menu.
@@ -234,7 +234,7 @@ public:
    * @param p the new popup menu
    * @param unused Has no effect - ignore it.
    */
-  void setDelayedPopup(QPopupMenu *p, bool unused = false);
+  void setDelayedPopup(TQPopupMenu *p, bool unused = false);
 
   /**
    * Turn this button into a radio button
@@ -267,18 +267,18 @@ public slots:
    * orientation changing, etc.
    */
    void modeChange();
-   virtual void setTextLabel(const QString&, bool tipToo);
+   virtual void setTextLabel(const TQString&, bool tipToo);
 
 protected:
-  void paletteChange(const QPalette &);
-  void leaveEvent(QEvent *e);
-  void enterEvent(QEvent *e);
-  void drawButton(QPainter *p);
-  bool eventFilter (QObject *o, QEvent *e);
+  void paletteChange(const TQPalette &);
+  void leaveEvent(TQEvent *e);
+  void enterEvent(TQEvent *e);
+  void drawButton(TQPainter *p);
+  bool eventFilter (TQObject *o, TQEvent *e);
   void showMenu();
-  QSize sizeHint() const;
-  QSize minimumSizeHint() const;
-  QSize minimumSize() const;
+  TQSize sizeHint() const;
+  TQSize minimumSizeHint() const;
+  TQSize minimumSize() const;
 
   /// @since 3.1
   bool isRaised() const;
@@ -305,7 +305,7 @@ private:
 * @internal
 * @version $Id: ktoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $
 */
-class KToolBarButtonList : public QIntDict<KToolBarButton>
+class KToolBarButtonList : public TQIntDict<KToolBarButton>
 {
 public:
    KToolBarButtonList();
diff --git a/python/pykde/extra/kde321/kurifilter.h b/python/pykde/extra/kde321/kurifilter.h
index 8c5f5fe7..834bff8a 100644
--- a/python/pykde/extra/kde321/kurifilter.h
+++ b/python/pykde/extra/kde321/kurifilter.h
@@ -25,9 +25,9 @@
 #ifndef __kurifilter_h__
 #define __kurifilter_h__ "$Id: kurifilter.h,v 1.41 2003/08/30 08:56:21 raabe Exp $"
 
-#include <qptrlist.h>
-#include <qobject.h>
-#include <qstringlist.h>
+#include <tqptrlist.h>
+#include <tqobject.h>
+#include <tqstringlist.h>
 
 #include <kurl.h>
 #include <kdemacros.h>
@@ -51,7 +51,7 @@ class KCModule;
 * \b Example
 *
 * \code
-*   QString text = "kde.org";
+*   TQString text = "kde.org";
 *   KURIFilterData d = text;
 *   bool filtered = KURIFilter::self()->filter( d );
 *   cout << "URL: " << text.latin1() << endl
@@ -114,7 +114,7 @@ public:
      *
      * @param url is the string to be filtered.
      */
-    KURIFilterData( const QString& url ) { init( url ); }
+    KURIFilterData( const TQString& url ) { init( url ); }
 
     /**
      * Copy constructor.
@@ -158,11 +158,11 @@ public:
      * This functions returns the error message set
      * by the plugin whenever the uri type is set to
      * KURIFilterData::ERROR.  Otherwise, it returns
-     * a QString::null.
+     * a TQString::null.
      *
      * @return the error message or a NULL when there is none.
      */
-    QString errorMsg() const { return m_strErrMsg; }
+    TQString errorMsg() const { return m_strErrMsg; }
 
     /**
      * Returns the URI type.
@@ -182,7 +182,7 @@ public:
      *
      * @param url the string to be filtered.
      */
-    void setData( const QString& url ) { init( url ); }
+    void setData( const TQString& url ) { init( url ); }
 
     /**
      * Same as above except the argument is a URL.
@@ -209,14 +209,14 @@ public:
      * @param abs_path  the abolute path to the local resource.
      * @return true if absolute path is successfully set. Otherwise, false.
      */
-    bool setAbsolutePath( const QString& abs_path );
+    bool setAbsolutePath( const TQString& abs_path );
 
     /**
      * Returns the absolute path if one has already been set.
-     * @return the absolute path, or QString::null
+     * @return the absolute path, or TQString::null
      * @see hasAbsolutePath()
      */
-    QString absolutePath() const;
+    TQString absolutePath() const;
 
     /**
      * Checks whether the supplied data had an absolute path.
@@ -229,9 +229,9 @@ public:
      * Returns the command line options and arguments for a
      * local resource when present.
      *
-     * @return options and arguments when present, otherwise QString::null
+     * @return options and arguments when present, otherwise TQString::null
      */
-    QString argsAndOptions() const;
+    TQString argsAndOptions() const;
 
     /**
      * Checks whether the current data is a local resource with
@@ -249,9 +249,9 @@ public:
      * is found.
      *
      * @return the name of the icon associated with the resource,
-     *         or QString::null if not found
+     *         or TQString::null if not found
      */
-    QString iconName();
+    TQString iconName();
 
     /**
      * Check whether the provided uri is executable or not.
@@ -277,7 +277,7 @@ public:
      * @return the string as typed by the user, before any URL processing is done
      * @since 3.2
      */
-    QString typedString() const;
+    TQString typedString() const;
 
     /**
      * Overloaded assigenment operator.
@@ -297,7 +297,7 @@ public:
      *
      * @return an instance of a KURIFilterData object.
      */
-    KURIFilterData& operator=( const QString& url ) { init( url ); return *this; }
+    KURIFilterData& operator=( const TQString& url ) { init( url ); return *this; }
 
 protected:
 
@@ -311,14 +311,14 @@ protected:
      * Initializes the KURIFilterData on construction.
      * @param url the URL to initialize the object with
      */
-    void init( const QString& url = QString::null );
+    void init( const TQString& url = TQString::null );
 
 private:
     bool m_bCheckForExecutables;
     bool m_bChanged;
 
-    QString m_strErrMsg;
-    QString m_strIconName;
+    TQString m_strErrMsg;
+    TQString m_strIconName;
 
     KURL m_pURI;
     URITypes m_iType;
@@ -352,14 +352,14 @@ public:
      * @param name the name of the plugin, or 0 for no name
      * @param pri the priority of the plugin.
      */
-    KURIFilterPlugin( QObject *parent = 0, const char *name = 0, double pri = 1.0 );
+    KURIFilterPlugin( TQObject *parent = 0, const char *name = 0, double pri = 1.0 );
 
     /**
      * Returns the filter's name.
      *
      * @return A string naming the filter.
      */
-    virtual QString name() const { return m_strName; }
+    virtual TQString name() const { return m_strName; }
 
     /**
      * Returns the filter's priority.
@@ -387,14 +387,14 @@ public:
      *
      * @return A configuration module, 0 if the filter isn't configurable.
      */
-    virtual KCModule *configModule( QWidget*, const char* ) const { return 0; }
+    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
      *
-     * @return the name of a configuration module or QString::null if none.
+     * @return the name of a configuration module or TQString::null if none.
      */
-    virtual QString configName() const { return name(); }
+    virtual TQString configName() const { return name(); }
 
 protected:
 
@@ -406,7 +406,7 @@ protected:
     /**
      * Sets the error message in @p data to @p errormsg.
      */
-    void setErrorMsg ( KURIFilterData& data, const QString& errmsg ) const {
+    void setErrorMsg ( KURIFilterData& data, const TQString& errmsg ) const {
         data.m_strErrMsg = errmsg;
     }
 
@@ -422,9 +422,9 @@ protected:
      * Sets the arguments and options string in @p data
      * to @p args if any were found during filterting.
      */
-    void setArguments( KURIFilterData& data, const QString& args ) const;
+    void setArguments( KURIFilterData& data, const TQString& args ) const;
 
-    QString m_strName;
+    TQString m_strName;
     double m_dblPriority;
 
 protected:
@@ -437,7 +437,7 @@ private:
 /**
  * A list of filter plugins.
  */
-class KURIFilterPluginList : public QPtrList<KURIFilterPlugin>
+class KURIFilterPluginList : public TQPtrList<KURIFilterPlugin>
 {
 public:
     virtual int compareItems(Item a, Item b)
@@ -491,25 +491,25 @@ private:
  * of a boolean flag:
  *
  * \code
- * QString u = KURIFilter::self()->filteredURI( "kde.org" );
+ * TQString u = KURIFilter::self()->filteredURI( "kde.org" );
  * \endcode
  *
  * You can also restrict the filter(s) to be used by supplying
  * the name of the filter(s) to use.  By defualt all available
  * filters will be used. To use specific filters, add the names
- * of the filters you want to use to a QStringList and invoke
+ * of the filters you want to use to a TQStringList and invoke
  * the appropriate filtering function. The examples below show
  * the use of specific filters. The first one uses a single
  * filter called kshorturifilter while the second example uses
  * multiple filters:
  *
  * \code
- * QString text = "kde.org";
+ * TQString text = "kde.org";
  * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" );
  * \endcode
  *
  * \code
- * QStringList list;
+ * TQStringList list;
  * list << "kshorturifilter" << "localdomainfilter";
  * bool filtered = KURIFilter::self()->filterURI( text, list );
  * \endcode
@@ -546,7 +546,7 @@ public:
      *
      * @return a boolean indicating whether the URI has been changed
      */
-    bool filterURI( KURIFilterData& data, const QStringList& filters = QStringList() );
+    bool filterURI( KURIFilterData& data, const TQStringList& filters = TQStringList() );
 
     /**
      * Filters the URI given by the URL.
@@ -559,7 +559,7 @@ public:
      *
      * @return a boolean indicating whether the URI has been changed
      */
-    bool filterURI( KURL &uri, const QStringList& filters = QStringList() );
+    bool filterURI( KURL &uri, const TQStringList& filters = TQStringList() );
 
     /**
      * Filters a string representing a URI.
@@ -572,7 +572,7 @@ public:
      *
      * @return a boolean indicating whether the URI has been changed
      */
-    bool filterURI( QString &uri, const QStringList& filters = QStringList() );
+    bool filterURI( TQString &uri, const TQStringList& filters = TQStringList() );
 
     /**
      * Returns the filtered URI.
@@ -585,7 +585,7 @@ public:
      *
      * @return the filtered URI or null if it cannot be filtered
      */
-    KURL filteredURI( const KURL &uri, const QStringList& filters = QStringList() );
+    KURL filteredURI( const KURL &uri, const TQStringList& filters = TQStringList() );
 
     /**
      * Return a filtered string representation of a URI.
@@ -598,7 +598,7 @@ public:
      *
      * @return the filtered URI or null if it cannot be filtered
      */
-    QString filteredURI( const QString &uri, const QStringList& filters = QStringList() );
+    TQString filteredURI( const TQString &uri, const TQStringList& filters = TQStringList() );
 
     /**
      * Return an iterator to iterate over all loaded
@@ -606,15 +606,15 @@ public:
      *
      * @return a plugin iterator.
      */
-    QPtrListIterator<KURIFilterPlugin> pluginsIterator() const;
+    TQPtrListIterator<KURIFilterPlugin> pluginsIterator() const;
 
     /**
      * Return a list of the names of all loaded plugins.
      *
-     * @return a QStringList of plugin names
+     * @return a TQStringList of plugin names
      * @since 3.1
      */
-    QStringList pluginNames() const;
+    TQStringList pluginNames() const;
 
 protected:
 
diff --git a/python/pykde/extra/kde321/selectdialog.h b/python/pykde/extra/kde321/selectdialog.h
index b5e962c2..680d48ef 100644
--- a/python/pykde/extra/kde321/selectdialog.h
+++ b/python/pykde/extra/kde321/selectdialog.h
@@ -24,9 +24,9 @@
 #ifndef KRESOURCES_SELECTDIALOG_H
 #define KRESOURCES_SELECTDIALOG_H
 
-#include <qobject.h>
-#include <qptrlist.h>
-#include <qmap.h>
+#include <tqobject.h>
+#include <tqptrlist.h>
+#include <tqmap.h>
 
 #include <kdialog.h>
 
@@ -43,7 +43,7 @@ class Resource;
  *
  * \code
  *
- * QPtrList<Resource> list = ... // can be retrived from KRES::Manager (e.g. KABC::AddressBook)
+ * TQPtrList<Resource> list = ... // can be retrived from KRES::Manager (e.g. KABC::AddressBook)
  *
  * KABC::Resource *res = KABC::SelectDialog::getResource( list, parentWdg );
  * if ( !res ) {
@@ -62,7 +62,7 @@ class SelectDialog
      * @param parent The parent widget
      * @param name   The name of the dialog
      */
-    SelectDialog( QPtrList<Resource> list, QWidget *parent = 0,
+    SelectDialog( TQPtrList<Resource> list, TQWidget *parent = 0,
         const char *name = 0);
 
     /**
@@ -74,12 +74,12 @@ class SelectDialog
      * Opens a dialog showing the available resources and returns the resource the
      * user has selected. Returns 0, if the dialog was canceled.
      */
-    static Resource *getResource( QPtrList<Resource> list, QWidget *parent = 0 );
+    static Resource *getResource( TQPtrList<Resource> list, TQWidget *parent = 0 );
 
   private:
     KListBox *mResourceId;
 
-    QMap<int, Resource*> mResourceMap;
+    TQMap<int, Resource*> mResourceMap;
 };
 
 }