1 files changed, 36 insertions, 33 deletions

diff --git a/src/modules/popupeditor/popupeditor.h b/src/modules/popupeditor/popupeditor.h
index 3560ffa7..5c4ce209 100644
--- a/src/modules/popupeditor/popupeditor.h
+++ b/src/modules/popupeditor/popupeditor.h
@@ -26,11 +26,11 @@
 #include "kvi_string.h"
 
 
-#include <qwidget.h>
+#include <tqwidget.h>
 #include "kvi_tal_listview.h"
-#include <qlineedit.h>
+#include <tqlineedit.h>
 #include "kvi_tal_popupmenu.h"
-#include <qpushbutton.h>
+#include <tqpushbutton.h>
 
 class KviKvsPopupMenu;
 class KviKvsPopupMenuItem;
@@ -42,22 +42,22 @@ public:
 	enum Type { Item , Menu , Separator , Label , Epilogue , Prologue , ExtMenu };
 public:
 	KviPopupListViewItem(KviTalListView * pListView,KviPopupListViewItem * after,Type t);
-	KviPopupListViewItem(KviPopupListViewItem * parent,KviPopupListViewItem * after,Type t);
+	KviPopupListViewItem(KviPopupListViewItem * tqparent,KviPopupListViewItem * after,Type t);
 public:
 	Type                   m_type;
-	QString                m_szText;
-	QString                m_szCondition;
-	QString                m_szIcon;
-	QString                m_szCode;
-	QString                m_szId;
+	TQString                m_szText;
+	TQString                m_szCondition;
+	TQString                m_szIcon;
+	TQString                m_szCode;
+	TQString                m_szId;
 private:
 	void init();
 public:
-	void setItemText(const QString & szText);
-	void setCondition(const QString & szCondition);
-	void setIcon(const QString & szIcon);
-	void setCode(const QString & szCode);
-	void setId(const QString & szId);
+	void setItemText(const TQString & szText);
+	void setCondition(const TQString & szCondition);
+	void setIcon(const TQString & szIcon);
+	void setCode(const TQString & szCode);
+	void setId(const TQString & szId);
 };
 
 
@@ -66,25 +66,26 @@ class KviScriptEditor;
 
 class KviMenuListViewItem;
 
-class KviSinglePopupEditor : public QWidget
+class KviSinglePopupEditor : public TQWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviSinglePopupEditor(QWidget * par);
+	KviSinglePopupEditor(TQWidget * par);
 	~KviSinglePopupEditor();
 protected:
-	QPushButton          * m_pMenuButton;
+	TQPushButton          * m_pMenuButton;
 	KviKvsPopupMenu      * m_pClipboard;
 	KviKvsPopupMenu      * m_pTestPopup;
 	KviPopupListViewItem * m_pLastSelectedItem;
 	KviTalListView            * m_pListView;
-	QLineEdit            * m_pNameEditor;
+	TQLineEdit            * m_pNameEditor;
 	KviScriptEditor      * m_pEditor;
-	QLineEdit            * m_pTextEditor;
-	QLineEdit            * m_pIdEditor;
-	QLineEdit            * m_pIconEditor;
-	QLineEdit            * m_pConditionEditor;
-	QLineEdit            * m_pExtNameEditor;
+	TQLineEdit            * m_pTextEditor;
+	TQLineEdit            * m_pIdEditor;
+	TQLineEdit            * m_pIconEditor;
+	TQLineEdit            * m_pConditionEditor;
+	TQLineEdit            * m_pExtNameEditor;
 	KviTalPopupMenu           * m_pContextPopup;
 public:
 	void edit(KviMenuListViewItem * it);
@@ -126,7 +127,7 @@ protected slots:
 	void contextNewPrologue();
 	void contextNewEpilogue();
 	void selectionChanged(KviTalListViewItem * it);
-	void itemPressed(KviTalListViewItem *it,const QPoint &pnt,int col);
+	void itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int col);
 	void testPopup();
 	void testModeMenuItemClicked(KviKvsPopupMenuItem * it);
 };
@@ -147,11 +148,12 @@ public:
 };
 
 
-class KviPopupEditor : public QWidget
+class KviPopupEditor : public TQWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviPopupEditor(QWidget * par);
+	KviPopupEditor(TQWidget * par);
 	~KviPopupEditor();
 public:
 	KviSinglePopupEditor * m_pEditor;
@@ -169,14 +171,14 @@ protected slots:
 	void exportSelected();
 	void exportCurrentPopup();
 	void removeCurrentPopup();
-	void itemPressed(KviTalListViewItem *it,const QPoint &pnt,int col);
+	void itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int col);
 protected:
-	void showEvent(QShowEvent *e);
-	void getExportPopupBuffer(QString &buffer,KviMenuListViewItem * it);
+	void showEvent(TQShowEvent *e);
+	void getExportPopupBuffer(TQString &buffer,KviMenuListViewItem * it);
 private:
 	void oneTimeSetup();
 	void saveLastEditedItem();
-	void getUniquePopupName(KviMenuListViewItem * it,QString &buffer);
+	void getUniquePopupName(KviMenuListViewItem * it,TQString &buffer);
 };
 
 
@@ -184,16 +186,17 @@ private:
 class KviPopupEditorWindow : public KviWindow
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	KviPopupEditorWindow(KviFrame * lpFrm);
 	~KviPopupEditorWindow();
 protected:
 	KviPopupEditor * m_pEditor;
-	QWidget        * m_pBase;
+	TQWidget        * m_pBase;
 protected:
-	virtual QPixmap * myIconPtr();
+	virtual TQPixmap * myIconPtr();
 	virtual void fillCaptionBuffers();
-	virtual void resizeEvent(QResizeEvent *e);
+	virtual void resizeEvent(TQResizeEvent *e);
 	virtual void getConfigGroupName(KviStr &szName);
 	virtual void saveProperties(KviConfig *);
 	virtual void loadProperties(KviConfig *);