summaryrefslogtreecommitdiffstats
path: root/kitchensync/src/conflictdialog.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:53:50 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:53:50 +0000
commit7be55ffa061c026e35e2d6a0effe1161ddb0d41f (patch)
tree8474f9b444b2756228600050f07a7ff25de532b2 /kitchensync/src/conflictdialog.h
parentf587f20a6d09f1729dd0a8c1cd8ee0110aec7451 (diff)
downloadtdepim-7be55ffa061c026e35e2d6a0effe1161ddb0d41f.tar.gz
tdepim-7be55ffa061c026e35e2d6a0effe1161ddb0d41f.zip
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kitchensync/src/conflictdialog.h')
-rw-r--r--kitchensync/src/conflictdialog.h4
1 files changed, 2 insertions, 2 deletions
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;