TQt4 port kbarcode

This enables compilation under both Qt3 and Qt4


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

1 files changed, 23 insertions, 22 deletions

diff --git a/kbarcode/newlabel.h b/kbarcode/newlabel.h
index 5c5da06..aa480e5 100644
--- a/kbarcode/newlabel.h
+++ b/kbarcode/newlabel.h
@@ -18,26 +18,27 @@
 #ifndef NEWLABEL_H
 #define NEWLABEL_H
 
-#include <qdialog.h>
-#include <qwidget.h>
+#include <tqdialog.h>
+#include <tqwidget.h>
 
 #include "definition.h"
 
-class QVBoxLayout;
-class QHBoxLayout; 
-class QGridLayout; 
-class QCheckBox;
-class QComboBox;
+class TQVBoxLayout;
+class TQHBoxLayout; 
+class TQGridLayout; 
+class TQCheckBox;
+class TQComboBox;
 class KComboBox;
 class KPushButton;
-class QLabel;
-class QString;
+class TQLabel;
+class TQString;
 class LabelPreview;
-class NewLabel : public QDialog
+class NewLabel : public TQDialog
 { 
     Q_OBJECT
+  TQ_OBJECT
     public:
-        NewLabel( QWidget* parent = 0, const char* name = 0, bool change = FALSE, WFlags fl = 0 );
+        NewLabel( TQWidget* tqparent = 0, const char* name = 0, bool change = FALSE, WFlags fl = 0 );
         ~NewLabel();
 
         int labelId() const { return curid; }
@@ -45,7 +46,7 @@ class NewLabel : public QDialog
 
         void setLabelId( int id );
 
-        static bool isInCombo( QComboBox* combo, QString text );
+        static bool isInCombo( TQComboBox* combo, TQString text );
 
     private slots:
         void updateType();
@@ -55,25 +56,25 @@ class NewLabel : public QDialog
     private:
         void fillData();
 
-        QLabel* TextLabel1;
-        QLabel* TextLabel2;
-        QLabel* TextLabel3;
-        QCheckBox* checkEmpty;
+        TQLabel* TextLabel1;
+        TQLabel* TextLabel2;
+        TQLabel* TextLabel3;
+        TQCheckBox* checkEmpty;
         KComboBox* comboProducer;
         KComboBox* comboType;
         KPushButton* buttonOwnFormat;
-        QLabel* TextLabel4;
+        TQLabel* TextLabel4;
         KPushButton* buttonOk;
         KPushButton* buttonCancel;
         LabelPreview* preview;
-        QStringList* types;
+        TQStringList* types;
         
     protected:
         int curid;
-        QVBoxLayout* NewLabelLayout;
-        QHBoxLayout* Layout5;
-        QHBoxLayout* Layout2;
-        QHBoxLayout* Layout1;
+        TQVBoxLayout* NewLabelLayout;
+        TQHBoxLayout* Layout5;
+        TQHBoxLayout* Layout2;
+        TQHBoxLayout* Layout1;
 };
 
 #endif // NEWLABEL_H