summaryrefslogtreecommitdiffstats
path: root/cervisia/diffdlg.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:51:49 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:51:49 +0000
commit4ae0c208b66e0f7954e194384464fe2d0a2c56dd (patch)
treeb0a7cd1c184f0003c0292eb416ed27f674f9cc43 /cervisia/diffdlg.h
parent1964ea0fb4ab57493ca2ebb709c8d3b5395fd653 (diff)
downloadtdesdk-4ae0c208b66e0f7954e194384464fe2d0a2c56dd.tar.gz
tdesdk-4ae0c208b66e0f7954e194384464fe2d0a2c56dd.zip
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1157652 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'cervisia/diffdlg.h')
-rw-r--r--cervisia/diffdlg.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/cervisia/diffdlg.h b/cervisia/diffdlg.h
index 25407c96..f234b36c 100644
--- a/cervisia/diffdlg.h
+++ b/cervisia/diffdlg.h
@@ -21,7 +21,7 @@
#ifndef DIFFDLG_H
#define DIFFDLG_H
-#include <qptrlist.h>
+#include <tqptrlist.h>
#include <kdialogbase.h>
@@ -40,16 +40,16 @@ class DiffDialog : public KDialogBase
public:
- explicit DiffDialog( KConfig& config, QWidget *parent=0, const char *name=0,
+ explicit DiffDialog( KConfig& config, TQWidget *parent=0, const char *name=0,
bool modal=false );
virtual ~DiffDialog();
- bool parseCvsDiff(CvsService_stub* service, const QString &fileName,
- const QString &revA, const QString &revB);
+ bool parseCvsDiff(CvsService_stub* service, const TQString &fileName,
+ const TQString &revA, const TQString &revB);
protected:
- virtual void keyPressEvent(QKeyEvent *e);
+ virtual void keyPressEvent(TQKeyEvent *e);
private slots:
void toggleSynchronize(bool b);
@@ -59,24 +59,24 @@ private slots:
void saveAsClicked();
private:
- void newDiffHunk(int& linenoA, int& linenoB, const QStringList& linesA,
- const QStringList& linesB);
- void callExternalDiff(const QString& extdiff, CvsService_stub* service,
- const QString& fileName, const QString& revA,
- const QString& revB);
+ void newDiffHunk(int& linenoA, int& linenoB, const TQStringList& linesA,
+ const TQStringList& linesB);
+ void callExternalDiff(const TQString& extdiff, CvsService_stub* service,
+ const TQString& fileName, const TQString& revA,
+ const TQString& revB);
void updateNofN();
void updateHighlight(int newitem);
- QLabel *revlabel1, *revlabel2, *nofnlabel;
- QCheckBox *syncbox;
- QComboBox *itemscombo;
- QPushButton *backbutton, *forwbutton;
+ TQLabel *revlabel1, *revlabel2, *nofnlabel;
+ TQCheckBox *syncbox;
+ TQComboBox *itemscombo;
+ TQPushButton *backbutton, *forwbutton;
DiffView *diff1, *diff2;
- QPtrList<DiffItem> items;
+ TQPtrList<DiffItem> items;
int markeditem;
KConfig& partConfig;
- QStringList m_diffOutput;
+ TQStringList m_diffOutput;
};
#endif