summaryrefslogtreecommitdiffstats
path: root/kompare/komparenavtreepart/komparenavtreepart.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-12 01:36:19 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-12 01:36:19 +0000
commit99a2774ca6f1cab334de5d43fe36fc44ae889a4c (patch)
treeeff34cf0762227f6baf2a93e8fef48d4bed2651c /kompare/komparenavtreepart/komparenavtreepart.h
parent1c104292188541106338d4940b0f04beeb4301a0 (diff)
downloadtdesdk-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 'kompare/komparenavtreepart/komparenavtreepart.h')
-rw-r--r--kompare/komparenavtreepart/komparenavtreepart.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/kompare/komparenavtreepart/komparenavtreepart.h b/kompare/komparenavtreepart/komparenavtreepart.h
index a126cfe5..6fa0667b 100644
--- a/kompare/komparenavtreepart/komparenavtreepart.h
+++ b/kompare/komparenavtreepart/komparenavtreepart.h
@@ -47,9 +47,10 @@ class KChangeLVI;
class KompareNavTreePart : public KParts::ReadOnlyPart
{
Q_OBJECT
+ TQ_OBJECT
public:
- KompareNavTreePart( TQWidget* parent = 0L, const char* name = 0L );
+ KompareNavTreePart( TQWidget* tqparent = 0L, const char* name = 0L );
virtual ~KompareNavTreePart();
public:
@@ -87,7 +88,7 @@ private:
TQString compareFromEndAndReturnSame( const TQString& string1, const TQString& string2 );
void addDirToTreeView( enum Kompare::Target, const TQString& filename );
- KListViewItem* findDirInDirTree( const KListViewItem* parent, const TQString& dir );
+ KListViewItem* findDirInDirTree( const KListViewItem* tqparent, const TQString& dir );
// KListViewItem* firstItem();
// KListViewItem* lastItem();
@@ -124,7 +125,7 @@ private:
class KChangeLVI : public KListViewItem
{
public:
- KChangeLVI( KListView* parent, Diff2::Difference* diff );
+ KChangeLVI( KListView* tqparent, Diff2::Difference* diff );
~KChangeLVI();
public:
Diff2::Difference* difference() { return m_difference; };
@@ -138,7 +139,7 @@ private:
class KFileLVI : public KListViewItem
{
public:
- KFileLVI( KListView* parent, Diff2::DiffModel* model );
+ KFileLVI( KListView* tqparent, Diff2::DiffModel* model );
~KFileLVI();
public:
Diff2::DiffModel* model() { return m_model; };
@@ -150,8 +151,8 @@ private:
class KDirLVI : public KListViewItem
{
public:
- KDirLVI( KDirLVI* parent, TQString& dir );
- KDirLVI( KListView* parent, TQString& dir );
+ KDirLVI( KDirLVI* tqparent, TQString& dir );
+ KDirLVI( KListView* tqparent, TQString& dir );
~KDirLVI();
public:
void addModel( TQString& dir, Diff2::DiffModel* model, TQPtrDict<KDirLVI>* modelToDirItemDict );
@@ -175,11 +176,12 @@ class KAboutData;
class KompareNavTreePartFactory : public KParts::Factory
{
Q_OBJECT
+ TQ_OBJECT
public:
KompareNavTreePartFactory();
virtual ~KompareNavTreePartFactory();
- virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
- TQObject *parent, const char *name,
+ virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+ TQObject *tqparent, const char *name,
const char *classname, const TQStringList &args );
static KInstance* instance();