From 4ae0c208b66e0f7954e194384464fe2d0a2c56dd Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:51:49 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1157652 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kompare/libdialogpages/diffsettings.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'kompare/libdialogpages/diffsettings.h') diff --git a/kompare/libdialogpages/diffsettings.h b/kompare/libdialogpages/diffsettings.h index 46962cb8..a41308c0 100644 --- a/kompare/libdialogpages/diffsettings.h +++ b/kompare/libdialogpages/diffsettings.h @@ -20,8 +20,8 @@ #ifndef DIFFSETTINGS_H #define DIFFSETTINGS_H -#include -#include +#include +#include #include "kompare.h" #include "settingsbase.h" @@ -30,7 +30,7 @@ class DiffSettings : public SettingsBase { Q_OBJECT public: - DiffSettings( QWidget* parent ); + DiffSettings( TQWidget* parent ); virtual ~DiffSettings(); public: // some virtual functions that will be overloaded from the base class @@ -38,7 +38,7 @@ public: virtual void saveSettings( KConfig* config ); public: - QString m_diffProgram; + TQString m_diffProgram; int m_linesOfContext; Kompare::Format m_format; bool m_largeFiles; // -H @@ -51,16 +51,16 @@ public: bool m_showCFunctionChange; // -p bool m_convertTabsToSpaces; // -t bool m_ignoreRegExp; // -I - QString m_ignoreRegExpText; // the RE for -I - QStringList m_ignoreRegExpTextHistory; + TQString m_ignoreRegExpText; // the RE for -I + TQStringList m_ignoreRegExpTextHistory; bool m_recursive; // -r bool m_newFiles; // -N // bool m_allText; // -a bool m_excludeFilePattern; // -x - QStringList m_excludeFilePatternList; // The list of patterns for -x + TQStringList m_excludeFilePatternList; // The list of patterns for -x bool m_excludeFilesFile; // -X - QString m_excludeFilesFileURL; // The filename to -X - QStringList m_excludeFilesFileHistoryList; // The history list of filenames + TQString m_excludeFilesFileURL; // The filename to -X + TQStringList m_excludeFilesFileHistoryList; // The history list of filenames }; #endif -- cgit v1.2.1