diff options
Diffstat (limited to 'kompare/libdiff2/komparemodellist.h')
| -rw-r--r-- | kompare/libdiff2/komparemodellist.h | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/kompare/libdiff2/komparemodellist.h b/kompare/libdiff2/komparemodellist.h index 8ba264fb..d1f834ae 100644 --- a/kompare/libdiff2/komparemodellist.h +++ b/kompare/libdiff2/komparemodellist.h @@ -20,7 +20,7 @@ #ifndef KOMPAREMODELLIST_H #define KOMPAREMODELLIST_H -#include <qobject.h> +#include <tqobject.h> #include "diffmodel.h" #include "diffmodellist.h" @@ -42,7 +42,7 @@ class KompareModelList : public QObject { Q_OBJECT public: - KompareModelList( DiffSettings* diffSettings, struct Kompare::Info& info, QObject* parent = 0, const char* name = 0 ); + KompareModelList( DiffSettings* diffSettings, struct Kompare::Info& info, TQObject* parent = 0, const char* name = 0 ); ~KompareModelList(); public: @@ -50,34 +50,34 @@ public: void swap(); /* Comparing methods */ - bool compare( const QString& source, const QString& destination ); + bool compare( const TQString& source, const TQString& destination ); - bool compareFiles( const QString& source, const QString& destination ); - bool compareDirs( const QString& source, const QString& destination ); + bool compareFiles( const TQString& source, const TQString& destination ); + bool compareDirs( const TQString& source, const TQString& destination ); - bool openDiff( const QString& diff ); + bool openDiff( const TQString& diff ); - bool openFileAndDiff( const QString& file, const QString& diff ); - bool openDirAndDiff( const QString& dir, const QString& diff ); + bool openFileAndDiff( const TQString& file, const TQString& diff ); + bool openDirAndDiff( const TQString& dir, const TQString& diff ); - bool saveDiff( const QString& url, QString directory, DiffSettings* diffSettings ); + bool saveDiff( const TQString& url, TQString directory, DiffSettings* diffSettings ); bool saveAll(); bool saveDestination( DiffModel* model ); - void setEncoding( const QString& encoding ); + void setEncoding( const TQString& encoding ); - QString recreateDiff() const; + TQString recreateDiff() const; // This parses the difflines and creates new models - int parseDiffOutput( const QString& diff ); + int parseDiffOutput( const TQString& diff ); // Call this to emit the signals to the rest of the "world" to show the diff void show(); // This will blend the original URL (dir or file) into the diffmodel, // this is like patching but with a twist - bool blendOriginalIntoModelList( const QString& localURL ); + bool blendOriginalIntoModelList( const TQString& localURL ); enum Kompare::Mode mode() const { return m_info.mode; }; const DiffModelList* models() const { return m_models; }; @@ -110,12 +110,12 @@ private: void updateModelListActions(); protected: - bool blendFile( DiffModel* model, const QString& lines ); + bool blendFile( DiffModel* model, const TQString& lines ); signals: void status( Kompare::Status status ); void setStatusBarModelInfo( int modelIndex, int differenceIndex, int modelCount, int differenceCount, int appliedCount ); - void error( QString error ); + void error( TQString error ); void modelsChanged( const Diff2::DiffModelList* models ); void setSelection( const Diff2::DiffModel* model, const Diff2::Difference* diff ); void setSelection( const Diff2::Difference* diff ); @@ -154,24 +154,24 @@ protected slots: void slotSaveDestination(); private slots: - void slotDirectoryChanged( const QString& ); - void slotFileChanged( const QString& ); + void slotDirectoryChanged( const TQString& ); + void slotFileChanged( const TQString& ); private: // Helper methods - bool isDirectory( const QString& url ) const; - bool isDiff( const QString& mimetype ) const; - QString readFile( const QString& fileName ); + bool isDirectory( const TQString& url ) const; + bool isDiff( const TQString& mimetype ) const; + TQString readFile( const TQString& fileName ); bool hasPrevModel() const; bool hasNextModel() const; bool hasPrevDiff() const; bool hasNextDiff() const; - QStringList split( const QString& diff ); + TQStringList split( const TQString& diff ); private: KTempFile* m_diffTemp; - QString m_diffURL; + TQString m_diffURL; KompareProcess* m_diffProcess; @@ -179,8 +179,8 @@ private: DiffModelList* m_models; - QString m_source; - QString m_destination; + TQString m_source; + TQString m_destination; DiffModel* m_selectedModel; Difference* m_selectedDifference; @@ -204,8 +204,8 @@ private: KAction* m_save; - QString m_encoding; - QTextCodec* m_textCodec; + TQString m_encoding; + TQTextCodec* m_textCodec; }; } // End of namespace Diff2 |