From 7be55ffa061c026e35e2d6a0effe1161ddb0d41f Mon Sep 17 00:00:00 2001 From: tpearson 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 --- libkdepim/diffalgo.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'libkdepim/diffalgo.h') diff --git a/libkdepim/diffalgo.h b/libkdepim/diffalgo.h index cf341bfe8..927ba14f3 100644 --- a/libkdepim/diffalgo.h +++ b/libkdepim/diffalgo.h @@ -22,7 +22,7 @@ #ifndef DIFFALGO_H #define DIFFALGO_H -#include +#include #include namespace KPIM { @@ -51,28 +51,28 @@ class DiffAlgoDisplay /** Sets the title of the left data source. */ - virtual void setLeftSourceTitle( const QString &title ) = 0; + virtual void setLeftSourceTitle( const TQString &title ) = 0; /** Sets the title of the right data source. */ - virtual void setRightSourceTitle( const QString &title ) = 0; + virtual void setRightSourceTitle( const TQString &title ) = 0; /** Adds a field which is only available in the left data source. */ - virtual void additionalLeftField( const QString &id, const QString &value ) = 0; + virtual void additionalLeftField( const TQString &id, const TQString &value ) = 0; /** Adds a field which is only available in the right data source. */ - virtual void additionalRightField( const QString &id, const QString &value ) = 0; + virtual void additionalRightField( const TQString &id, const TQString &value ) = 0; /** Adds a conflict between two fields. */ - virtual void conflictField( const QString &id, const QString &leftValue, - const QString &rightValue ) = 0; + virtual void conflictField( const TQString &id, const TQString &leftValue, + const TQString &rightValue ) = 0; }; @@ -102,35 +102,35 @@ class KDE_EXPORT DiffAlgo /** Sets the title of the left data source. */ - void setLeftSourceTitle( const QString &title ); + void setLeftSourceTitle( const TQString &title ); /** Sets the title of the right data source. */ - void setRightSourceTitle( const QString &title ); + void setRightSourceTitle( const TQString &title ); /** Adds a field which is only available in the left data source. */ - void additionalLeftField( const QString &id, const QString &value ); + void additionalLeftField( const TQString &id, const TQString &value ); /** Adds a field which is only available in the right data source. */ - void additionalRightField( const QString &id, const QString &value ); + void additionalRightField( const TQString &id, const TQString &value ); /** Adds a conflict between two fields. */ - void conflictField( const QString &id, const QString &leftValue, - const QString &rightValue ); + void conflictField( const TQString &id, const TQString &leftValue, + const TQString &rightValue ); void addDisplay( DiffAlgoDisplay *display ); void removeDisplay( DiffAlgoDisplay *display ); private: - QValueList mDisplays; + TQValueList mDisplays; }; } -- cgit v1.2.1