diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-31 19:26:01 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-31 19:26:01 +0000 |
| commit | a62982d5054f34acfecb55f019b7f2d0a4b5988d (patch) | |
| tree | ddcc61f46dddc1d8cf562cfe5395af33cccd4493 /kompare/libdiff2 | |
| parent | 6f54236d10cf16d143f9d41f929d132c19307d85 (diff) | |
| download | tdesdk-a62982d5054f34acfecb55f019b7f2d0a4b5988d.tar.gz tdesdk-a62982d5054f34acfecb55f019b7f2d0a4b5988d.zip | |
Fix kompare signal/slot problem
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1250621 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kompare/libdiff2')
| -rw-r--r-- | kompare/libdiff2/kompare.h | 2 | ||||
| -rw-r--r-- | kompare/libdiff2/komparemodellist.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kompare/libdiff2/kompare.h b/kompare/libdiff2/kompare.h index ded4c5a6..8f6b7fe5 100644 --- a/kompare/libdiff2/kompare.h +++ b/kompare/libdiff2/kompare.h @@ -63,7 +63,7 @@ namespace Kompare UnknownDiffMode // Use to initialize the Info struct }; - enum tqStatus { + enum Status { RunningDiff, Parsing, FinishedParsing, diff --git a/kompare/libdiff2/komparemodellist.h b/kompare/libdiff2/komparemodellist.h index 22230db0..db521b5f 100644 --- a/kompare/libdiff2/komparemodellist.h +++ b/kompare/libdiff2/komparemodellist.h @@ -114,7 +114,7 @@ protected: bool blendFile( DiffModel* model, const TQString& lines ); signals: - void status( Kompare::tqStatus status ); + void status( Kompare::Status status ); void setStatusBarModelInfo( int modelIndex, int differenceIndex, int modelCount, int differenceCount, int appliedCount ); void error( TQString error ); void modelsChanged( const Diff2::DiffModelList* models ); |