1 files changed, 36 insertions, 36 deletions

diff --git a/src/mergeelements.h b/src/mergeelements.h
index 88c011e..4752175 100644
--- a/src/mergeelements.h
+++ b/src/mergeelements.h
@@ -29,15 +29,15 @@
 class KPushButton;
 class KTextEdit;
 class KListView;
-class QProgressBar;
+class TQProgressBar;
 
 namespace KBibTeX
 {
-    class MergeElementsCliqueItem : public QObject, public QCheckListItem
+    class MergeElementsCliqueItem : public TQObject, public TQCheckListItem
     {
         Q_OBJECT
     public:
-        MergeElementsCliqueItem( BibTeX::Entry* entry, BibTeX::Macro* macro, BibTeX::Preamble* preamble, QListView *parent );
+        MergeElementsCliqueItem( BibTeX::Entry* entry, BibTeX::Macro* macro, BibTeX::Preamble* preamble, TQListView *parent );
         BibTeX::Entry* entry;
         BibTeX::Macro* macro;
         BibTeX::Preamble* preamble;
@@ -49,71 +49,71 @@ namespace KBibTeX
         void stateChanged( MergeElementsCliqueItem* );
     };
 
-    class MergeEntriesAlternativesController: public QCheckListItem
+    class MergeEntriesAlternativesController: public TQCheckListItem
     {
     public:
-        MergeEntriesAlternativesController( const QString &label, QListView *parent );
-        MergeEntriesAlternativesController( BibTeX::EntryField::FieldType fieldType, QListView *parent );
+        MergeEntriesAlternativesController( const TQString &label, TQListView *parent );
+        MergeEntriesAlternativesController( BibTeX::EntryField::FieldType fieldType, TQListView *parent );
         BibTeX::EntryField::FieldType fieldType;
-        const QString fieldName;
+        const TQString fieldName;
     };
 
-    class MergeMacrosAlternativesController: public QCheckListItem
+    class MergeMacrosAlternativesController: public TQCheckListItem
     {
     public:
-        MergeMacrosAlternativesController( bool isKey, QListView *parent );
+        MergeMacrosAlternativesController( bool isKey, TQListView *parent );
     };
 
 
-    class MergeEntriesAlternativesItem: public QCheckListItem
+    class MergeEntriesAlternativesItem: public TQCheckListItem
     {
     public:
         MergeEntriesAlternativesItem( BibTeX::EntryField *field, MergeEntriesAlternativesController *parent );
         BibTeX::EntryField *field;
     };
 
-    class MergeMacrosAlternativesItem: public QCheckListItem
+    class MergeMacrosAlternativesItem: public TQCheckListItem
     {
     public:
         MergeMacrosAlternativesItem( BibTeX::Value *value, MergeMacrosAlternativesController *parent );
         BibTeX::Value *value;
     };
 
-    class MergeElementsAlternativesId: public QCheckListItem
+    class MergeElementsAlternativesId: public TQCheckListItem
     {
     public:
-        MergeElementsAlternativesId( const QString &id, MergeEntriesAlternativesController *parent );
-        QString id;
+        MergeElementsAlternativesId( const TQString &id, MergeEntriesAlternativesController *parent );
+        TQString id;
     };
 
-    class MergeMacroAlternativesKey: public QCheckListItem
+    class MergeMacroAlternativesKey: public TQCheckListItem
     {
     public:
-        MergeMacroAlternativesKey( const QString &key, MergeMacrosAlternativesController *parent );
-        QString key;
+        MergeMacroAlternativesKey( const TQString &key, MergeMacrosAlternativesController *parent );
+        TQString key;
     };
 
 
-    class MergeEntriesAlternativesEntryType: public QCheckListItem
+    class MergeEntriesAlternativesEntryType: public TQCheckListItem
     {
     public:
-        MergeEntriesAlternativesEntryType( const QString &typeString, MergeEntriesAlternativesController *parent );
+        MergeEntriesAlternativesEntryType( const TQString &typeString, MergeEntriesAlternativesController *parent );
         MergeEntriesAlternativesEntryType( BibTeX::Entry::EntryType type, MergeEntriesAlternativesController *parent );
-        QString typeString;
+        TQString typeString;
         BibTeX::Entry::EntryType type;
     };
 
-    class MergePreambleAlternativesController: public QCheckListItem
+    class MergePreambleAlternativesController: public TQCheckListItem
     {
     public:
-        MergePreambleAlternativesController( QListView *parent );
+        MergePreambleAlternativesController( TQListView *parent );
     };
 
-    class MergePreambleAlternatives: public QCheckListItem
+    class MergePreambleAlternatives: public TQCheckListItem
     {
     public:
-        MergePreambleAlternatives( const QString &text, MergePreambleAlternativesController *parent );
-        QString text;
+        MergePreambleAlternatives( const TQString &text, MergePreambleAlternativesController *parent );
+        TQString text;
     };
 
     /**
@@ -123,18 +123,18 @@ namespace KBibTeX
     {
         Q_OBJECT
     public:
-        MergeElements( QWidget *parent );
+        MergeElements( TQWidget *parent );
         ~MergeElements();
         int mergeDuplicates( BibTeX::File *bibTeXFile );
 
     protected:
-        void showEvent( QShowEvent * );
+        void showEvent( TQShowEvent * );
 
     protected slots:
         void slotRefreshAlternatives();
         void slotNextClique();
         void slotPreviousClique();
-        void slotPreviewElement( QListViewItem *item );
+        void slotPreviewElement( TQListViewItem *item );
         void saveCurrentMergeSet();
         void slotRestore();
 
@@ -148,20 +148,20 @@ namespace KBibTeX
 
         typedef struct
         {
-            QValueList<BibTeX::Macro*> macros;
-            QValueList<BibTeX::Entry*> entries;
-            QValueList<BibTeX::EntryField*> fields;
-            QValueList<BibTeX::Preamble*> preambles;
-            QString macroKey;
+            TQValueList<BibTeX::Macro*> macros;
+            TQValueList<BibTeX::Entry*> entries;
+            TQValueList<BibTeX::EntryField*> fields;
+            TQValueList<BibTeX::Preamble*> preambles;
+            TQString macroKey;
             BibTeX::Value *macroValue;
-            QString id, typeString;
+            TQString id, typeString;
             BibTeX::Entry::EntryType type;
-            QString preambleText;
+            TQString preambleText;
         } MergeSet;
 
         KListView *m_listViewClique;
         KListView *m_listViewAlternatives;
-        QProgressBar *m_progressBar;
+        TQProgressBar *m_progressBar;
         FindDuplicates::DuplicateCliqueList m_duplicateCliqueList;
         MergeSet **m_mergeSetList;
         int m_currentCliqueIndex;