summaryrefslogtreecommitdiffstats
path: root/src/svnqt/conflictresult.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/svnqt/conflictresult.hpp')
-rw-r--r--src/svnqt/conflictresult.hpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/svnqt/conflictresult.hpp b/src/svnqt/conflictresult.hpp
index 0dfb426..2b72afb 100644
--- a/src/svnqt/conflictresult.hpp
+++ b/src/svnqt/conflictresult.hpp
@@ -27,11 +27,11 @@ struct svn_wc_conflict_result_t;
#include "svnqt/svnqt_defines.hpp"
#include <svn_types.h>
-#include <qstring.h>
+#include <tqstring.h>
namespace svn {
-class SVNQT_EXPORT ConflictResult
+class SVNTQT_EXPORT ConflictResult
{
public:
enum ConflictChoice {
@@ -50,11 +50,11 @@ class SVNQT_EXPORT ConflictResult
*/
ConflictResult(const svn_wc_conflict_result_t*);
- const QString& mergedFile()const
+ const TQString& mergedFile()const
{
return m_MergedFile;
}
- void setMergedFile(const QString&aMergedfile);
+ void setMergedFile(const TQString&aMergedfile);
ConflictChoice choice()const
{
@@ -70,7 +70,7 @@ class SVNQT_EXPORT ConflictResult
//! Merged file
/*! will only used if m_choice is ChooseMerged
*/
- QString m_MergedFile;
+ TQString m_MergedFile;
};
}