From 11f31c37e5fa4889d9989f10272f44845449cb7b Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Mon, 6 Sep 2010 20:59:29 +0000
Subject: Initial TQt conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1172292 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 src/gui/dialogs/FileMergeDialog.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/gui/dialogs/FileMergeDialog.h')

diff --git a/src/gui/dialogs/FileMergeDialog.h b/src/gui/dialogs/FileMergeDialog.h
index f305cae..33a8638 100644
--- a/src/gui/dialogs/FileMergeDialog.h
+++ b/src/gui/dialogs/FileMergeDialog.h
@@ -27,11 +27,11 @@
 #define _RG_FILEMERGEDIALOG_H_
 
 #include <kdialogbase.h>
-#include <qstring.h>
+#include <tqstring.h>
 
 
-class QWidget;
-class QCheckBox;
+class TQWidget;
+class TQCheckBox;
 class KComboBox;
 
 
@@ -45,13 +45,13 @@ class FileMergeDialog : public KDialogBase
     Q_OBJECT
 
 public:
-    FileMergeDialog(QWidget *parent, QString fileName, bool timingsDiffer);
+    FileMergeDialog(TQWidget *parent, TQString fileName, bool timingsDiffer);
 
     int getMergeOptions();
     
 private:
     KComboBox *m_choice;
-    QCheckBox *m_useTimings;
+    TQCheckBox *m_useTimings;
 };
 
 
-- 
cgit v1.2.1