From 7be55ffa061c026e35e2d6a0effe1161ddb0d41f Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 31 Jul 2010 19:53:50 +0000
Subject: Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kitchensync/src/conflictdialog.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kitchensync/src/conflictdialog.h')

diff --git a/kitchensync/src/conflictdialog.h b/kitchensync/src/conflictdialog.h
index 9718f4c65..1a17e06ca 100644
--- a/kitchensync/src/conflictdialog.h
+++ b/kitchensync/src/conflictdialog.h
@@ -21,7 +21,7 @@
 #ifndef CONFLICTDIALOG_H
 #define CONFLICTDIALOG_H
 
-#include <qdialog.h>
+#include <tqdialog.h>
 
 #include <libqopensync/syncmapping.h>
 
@@ -31,7 +31,7 @@
 class ConflictDialog : public QDialog
 {
   public:
-    ConflictDialog( QSync::SyncMapping &mapping, QWidget *parent );
+    ConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent );
 
   protected:
     QSync::SyncMapping mMapping;
-- 
cgit v1.2.1