summaryrefslogtreecommitdiffstats
path: root/kompare
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-31 19:26:01 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-31 19:26:01 +0000
commita62982d5054f34acfecb55f019b7f2d0a4b5988d (patch)
treeddcc61f46dddc1d8cf562cfe5395af33cccd4493 /kompare
parent6f54236d10cf16d143f9d41f929d132c19307d85 (diff)
downloadtdesdk-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')
-rw-r--r--kompare/komparepart/kompare_part.cpp32
-rw-r--r--kompare/komparepart/kompare_part.h4
-rw-r--r--kompare/libdiff2/kompare.h2
-rw-r--r--kompare/libdiff2/komparemodellist.h2
4 files changed, 20 insertions, 20 deletions
diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp
index 1339a203..3c110857 100644
--- a/kompare/komparepart/kompare_part.cpp
+++ b/kompare/komparepart/kompare_part.cpp
@@ -76,8 +76,8 @@ KomparePart::KomparePart( TQWidget *parentWidget, const char *widgetName,
// This creates the "Model creator" and connects the signals and slots
m_modelList = new Diff2::KompareModelList( m_diffSettings, m_info, this, "komparemodellist" );
- connect( m_modelList, TQT_SIGNAL(status( Kompare::tqStatus )),
- this, TQT_SLOT(slotSettqStatus( Kompare::tqStatus )) );
+ connect( m_modelList, TQT_SIGNAL(status( Kompare::Status )),
+ this, TQT_SLOT(slotSetStatus( Kompare::Status )) );
connect( m_modelList, TQT_SIGNAL(setStatusBarModelInfo( int, int, int, int, int )),
this, TQT_SIGNAL(setStatusBarModelInfo( int, int, int, int, int )) );
connect( m_modelList, TQT_SIGNAL(error( TQString )),
@@ -208,7 +208,7 @@ bool KomparePart::openDiff( const KURL& url )
result = m_modelList->openDiff( m_info.localSource );
updateActions();
updateCaption();
- updatetqStatus();
+ updateStatus();
}
else
{
@@ -232,7 +232,7 @@ bool KomparePart::openDiff( const TQString& diffOutput )
m_modelList->show();
updateActions();
updateCaption();
- updatetqStatus();
+ updateStatus();
}
return value;
@@ -308,7 +308,7 @@ void KomparePart::compare( const KURL& source, const KURL& destination )
m_modelList->compare( m_info.localSource, m_info.localDestination );
updateActions();
updateCaption();
- updatetqStatus();
+ updateStatus();
}
}
@@ -329,7 +329,7 @@ void KomparePart::compareFiles( const KURL& sourceFile, const KURL& destinationF
m_modelList->compareFiles( m_info.localSource, m_info.localDestination );
updateActions();
updateCaption();
- updatetqStatus();
+ updateStatus();
}
}
@@ -350,7 +350,7 @@ void KomparePart::compareDirs( const KURL& sourceDirectory, const KURL& destinat
m_modelList->compareDirs( m_info.localSource, m_info.localDestination );
updateActions();
updateCaption();
- updatetqStatus();
+ updateStatus();
}
}
@@ -359,7 +359,7 @@ void KomparePart::compare3Files( const KURL& /*originalFile*/, const KURL& /*cha
// FIXME: actually implement this some day :)
updateActions();
updateCaption();
- updatetqStatus();
+ updateStatus();
}
void KomparePart::openFileAndDiff( const KURL& file, const KURL& diffFile )
@@ -378,7 +378,7 @@ void KomparePart::openFileAndDiff( const KURL& file, const KURL& diffFile )
m_modelList->openFileAndDiff( m_info.localSource, m_info.localDestination );
updateActions();
updateCaption();
- updatetqStatus();
+ updateStatus();
}
}
@@ -398,7 +398,7 @@ void KomparePart::openDirAndDiff ( const KURL& dir, const KURL& diffFile )
m_modelList->openDirAndDiff( m_info.localSource, m_info.localDestination );
updateActions();
updateCaption();
- updatetqStatus();
+ updateStatus();
}
}
@@ -415,7 +415,7 @@ bool KomparePart::saveAll()
bool result = m_modelList->saveAll();
updateActions();
updateCaption();
- updatetqStatus();
+ updateStatus();
return result;
}
@@ -484,7 +484,7 @@ KAboutData *KomparePart::createAboutData()
return about;
}
-void KomparePart::slotSettqStatus( enum Kompare::tqStatus status )
+void KomparePart::slotSetStatus( enum Kompare::Status status )
{
updateActions();
@@ -496,10 +496,10 @@ void KomparePart::slotSettqStatus( enum Kompare::tqStatus status )
emit setStatusBarText( i18n( "Parsing diff output..." ) );
break;
case Kompare::FinishedParsing:
- updatetqStatus();
+ updateStatus();
break;
case Kompare::FinishedWritingDiff:
- updatetqStatus();
+ updateStatus();
emit diffURLChanged();
break;
default:
@@ -532,7 +532,7 @@ void KomparePart::updateCaption()
emit setWindowCaption( text );
}
-void KomparePart::updatetqStatus()
+void KomparePart::updateStatus()
{
TQString source = m_info.source.prettyURL();
TQString destination = m_info.destination.prettyURL();
@@ -608,7 +608,7 @@ void KomparePart::slotSwap()
// Update window caption and statusbar text
updateCaption();
- updatetqStatus();
+ updateStatus();
m_modelList->swap();
}
diff --git a/kompare/komparepart/kompare_part.h b/kompare/komparepart/kompare_part.h
index 7afc93fc..7be799a9 100644
--- a/kompare/komparepart/kompare_part.h
+++ b/kompare/komparepart/kompare_part.h
@@ -183,7 +183,7 @@ protected:
bool patchDir();
protected slots:
- void slotSettqStatus( Kompare::tqStatus status );
+ void slotSetStatus( Kompare::Status status );
void slotShowError( TQString error );
void slotSwap();
@@ -191,7 +191,7 @@ protected slots:
void optionsPreferences();
void updateActions();
void updateCaption();
- void updatetqStatus();
+ void updateStatus();
private:
void cleanUpTemporaryFiles();
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 );