diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-12 01:36:19 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-12 01:36:19 +0000 |
| commit | 99a2774ca6f1cab334de5d43fe36fc44ae889a4c (patch) | |
| tree | eff34cf0762227f6baf2a93e8fef48d4bed2651c /kfile-plugins/diff | |
| parent | 1c104292188541106338d4940b0f04beeb4301a0 (diff) | |
| download | tdesdk-99a2774ca6f1cab334de5d43fe36fc44ae889a4c.tar.gz tdesdk-99a2774ca6f1cab334de5d43fe36fc44ae889a4c.zip | |
TQt4 convert kdesdk
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kfile-plugins/diff')
| -rw-r--r-- | kfile-plugins/diff/kfile_diff.cpp | 14 | ||||
| -rw-r--r-- | kfile-plugins/diff/kfile_diff.h | 3 |
2 files changed, 9 insertions, 8 deletions
diff --git a/kfile-plugins/diff/kfile_diff.cpp b/kfile-plugins/diff/kfile_diff.cpp index 957d0574..1d8b832e 100644 --- a/kfile-plugins/diff/kfile_diff.cpp +++ b/kfile-plugins/diff/kfile_diff.cpp @@ -44,9 +44,9 @@ K_EXPORT_COMPONENT_FACTORY(kfile_diff, KGenericFactory<KDiffPlugin>("kfile_diff")) -KDiffPlugin::KDiffPlugin(TQObject *parent, const char *name, +KDiffPlugin::KDiffPlugin(TQObject *tqparent, const char *name, const TQStringList &preferredItems) - : KFilePlugin(parent, name, preferredItems) + : KFilePlugin(tqparent, name, preferredItems) { kdDebug(7034) << "diff plugin" << endl; @@ -210,25 +210,25 @@ enum KDiffPlugin::Format KDiffPlugin::determineDiffFormat( const TQStringList li while ( it != lines.end() ) { line = (*it); - if ( line.find( TQRegExp( "^[0-9]+[0-9,]*[acd][0-9]+[0-9,]*$" ), 0 ) == 0 ) + if ( line.tqfind( TQRegExp( "^[0-9]+[0-9,]*[acd][0-9]+[0-9,]*$" ), 0 ) == 0 ) { return KDiffPlugin::Normal; } - else if ( line.find( TQRegExp( "^--- " ), 0 ) == 0 ) + else if ( line.tqfind( TQRegExp( "^--- " ), 0 ) == 0 ) { // unified has first a '^--- ' line, then a '^+++ ' line return KDiffPlugin::Unified; } - else if ( line.find( TQRegExp( "^\\*\\*\\* [^\\t]+\\t" ), 0 ) == 0 ) + else if ( line.tqfind( TQRegExp( "^\\*\\*\\* [^\\t]+\\t" ), 0 ) == 0 ) { // context has first a '^*** ' line, then a '^--- ' line return KDiffPlugin::Context; } - else if ( line.find( TQRegExp( "^[acd][0-9]+ [0-9]+" ), 0 ) == 0 ) + else if ( line.tqfind( TQRegExp( "^[acd][0-9]+ [0-9]+" ), 0 ) == 0 ) { return KDiffPlugin::RCS; } - else if ( line.find( TQRegExp( "^[0-9]+[0-9,]*[acd]" ), 0 ) == 0 ) + else if ( line.tqfind( TQRegExp( "^[0-9]+[0-9,]*[acd]" ), 0 ) == 0 ) { return KDiffPlugin::Ed; } diff --git a/kfile-plugins/diff/kfile_diff.h b/kfile-plugins/diff/kfile_diff.h index a53d89bb..36b9f13b 100644 --- a/kfile-plugins/diff/kfile_diff.h +++ b/kfile-plugins/diff/kfile_diff.h @@ -25,9 +25,10 @@ class TQStringList; class KDiffPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KDiffPlugin( TQObject *parent, const char *name, + KDiffPlugin( TQObject *tqparent, const char *name, const TQStringList& preferredItems ); |