summaryrefslogtreecommitdiffstats
path: root/kompare/libdiff2/difference.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 /kompare/libdiff2/difference.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 'kompare/libdiff2/difference.h')
-rw-r--r--kompare/libdiff2/difference.h42
1 files changed, 21 insertions, 21 deletions
diff --git a/kompare/libdiff2/difference.h b/kompare/libdiff2/difference.h
index 91065891..51295636 100644
--- a/kompare/libdiff2/difference.h
+++ b/kompare/libdiff2/difference.h
@@ -20,8 +20,8 @@
#ifndef DIFFERENCE_H
#define DIFFERENCE_H
-#include <qvaluelist.h>
-#include <qvaluevector.h>
+#include <tqvaluelist.h>
+#include <tqvaluevector.h>
#include <kdebug.h>
@@ -62,9 +62,9 @@ private:
unsigned int m_offset;
};
-typedef QValueList<Marker*> MarkerList;
-typedef QValueList<Marker*>::iterator MarkerListIterator;
-typedef QValueList<Marker*>::const_iterator MarkerListConstIterator;
+typedef TQValueList<Marker*> MarkerList;
+typedef TQValueList<Marker*>::iterator MarkerListIterator;
+typedef TQValueList<Marker*>::const_iterator MarkerListConstIterator;
class DifferenceString
{
@@ -73,7 +73,7 @@ public:
{
// kdDebug(8101) << "DifferenceString::DifferenceString()" << endl;
}
- DifferenceString( const QString& string, const MarkerList& markerList = MarkerList() ) :
+ DifferenceString( const TQString& string, const MarkerList& markerList = MarkerList() ) :
m_string( string ),
m_markerList( markerList )
{
@@ -91,11 +91,11 @@ public:
~DifferenceString() {}
public:
- const QString& string() const
+ const TQString& string() const
{
return m_string;
}
- const QString& conflictString() const
+ const TQString& conflictString() const
{
return m_conflict;
}
@@ -103,12 +103,12 @@ public:
{
return m_markerList;
}
- void setString( const QString& string )
+ void setString( const TQString& string )
{
m_string = string;
calculateHash();
}
- void setConflictString( const QString& conflict )
+ void setConflictString( const TQString& conflict )
{
m_conflict = conflict;
}
@@ -142,15 +142,15 @@ protected:
}
private:
- QString m_string;
- QString m_conflict;
+ TQString m_string;
+ TQString m_conflict;
unsigned int m_hash;
MarkerList m_markerList;
};
-typedef QValueVector<DifferenceString*> DifferenceStringList;
-typedef QValueVector<DifferenceString*>::iterator DifferenceStringListIterator;
-typedef QValueVector<DifferenceString*>::const_iterator DifferenceStringListConstIterator;
+typedef TQValueVector<DifferenceString*> DifferenceStringList;
+typedef TQValueVector<DifferenceString*>::iterator DifferenceStringListIterator;
+typedef TQValueVector<DifferenceString*>::const_iterator DifferenceStringListConstIterator;
class Difference
{
@@ -190,13 +190,13 @@ public:
void setType( int type ) { m_type = type; }
- void addSourceLine( QString line );
- void addDestinationLine( QString line );
+ void addSourceLine( TQString line );
+ void addDestinationLine( TQString line );
/** This method will calculate the differences between the individual strings and store them as Markers */
void determineInlineDifferences();
- QString recreateDifference() const;
+ TQString recreateDifference() const;
private:
int m_type;
@@ -213,9 +213,9 @@ private:
LevenshteinTable* m_tableXXX; // now unused
};
-typedef QValueList<Difference*> DifferenceList;
-typedef QValueList<Difference*>::iterator DifferenceListIterator;
-typedef QValueList<Difference*>::const_iterator DifferenceListConstIterator;
+typedef TQValueList<Difference*> DifferenceList;
+typedef TQValueList<Difference*>::iterator DifferenceListIterator;
+typedef TQValueList<Difference*>::const_iterator DifferenceListConstIterator;
} // End of namespace Diff2