summaryrefslogtreecommitdiffstats
path: root/parts/diff/diffpart.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'parts/diff/diffpart.cpp')
-rw-r--r--parts/diff/diffpart.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
index 01c703d0..62fd20b2 100644
--- a/parts/diff/diffpart.cpp
+++ b/parts/diff/diffpart.cpp
@@ -36,13 +36,13 @@
#include "diffdlg.h"
#include "diffwidget.h"
-static const KDevPluginInfo data("kdevdiff");
+static const KDevPluginInfo pluginData("kdevdiff");
typedef KDevGenericFactory<DiffPart> DiffFactory;
-K_EXPORT_COMPONENT_FACTORY( libkdevdiff, DiffFactory( data ) )
+K_EXPORT_COMPONENT_FACTORY( libkdevdiff, DiffFactory( pluginData ) )
DiffPart::DiffPart(TQObject *parent, const char *name, const TQStringList &)
- : KDevDiffFrontend(&data, parent, name ? name : "DiffPart"), proc(0)
+ : KDevDiffFrontend(&pluginData, parent, name ? name : "DiffPart"), proc(0)
{
setInstance(DiffFactory::instance());
setXMLFile("kdevdiff.rc");
@@ -58,13 +58,13 @@ DiffPart::DiffPart(TQObject *parent, const char *name, const TQStringList &)
mainWindow()->setViewAvailable( diffWidget, false );
TDEAction *action = new TDEAction( i18n("Difference Viewer..."), 0,
- this, TQT_SLOT(slotExecDiff()),
+ this, TQ_SLOT(slotExecDiff()),
actionCollection(), "tools_diff" );
action->setToolTip(i18n("Difference viewer"));
action->setWhatsThis(i18n("<b>Difference viewer</b><p>Shows the contents of a patch file."));
- connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
- this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
+ connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
+ this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
}
static bool urlIsEqual(const KURL &a, const KURL &b)
@@ -121,7 +121,7 @@ void DiffPart::contextMenu( TQPopupMenu* popup, const Context* context )
if ( partController()->documentState( rw_part->url() ) != Clean )
{
int id = popup->insertItem( i18n( "Difference to Disk File" ),
- this, TQT_SLOT(localDiff()) );
+ this, TQ_SLOT(localDiff()) );
popup->TQMenuData::setWhatsThis(id, i18n("<b>Difference to disk file</b><p>Shows the difference between "
"the file contents in this editor and the file contents on disk."));
}
@@ -155,14 +155,14 @@ void DiffPart::localDiff()
*proc << "-u" << popupFile.path() << "-";
proc->setWorkingDirectory( popupFile.directory() );
- connect( proc, TQT_SIGNAL(processExited( TDEProcess* )),
- this, TQT_SLOT(processExited( TDEProcess* )) );
- connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int )),
- this, TQT_SLOT(receivedStdout( TDEProcess*, char*, int )) );
- connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*, char*, int )),
- this, TQT_SLOT(receivedStderr( TDEProcess*, char*, int )) );
- connect( proc, TQT_SIGNAL(wroteStdin( TDEProcess* )),
- this, TQT_SLOT(wroteStdin( TDEProcess* )) );
+ connect( proc, TQ_SIGNAL(processExited( TDEProcess* )),
+ this, TQ_SLOT(processExited( TDEProcess* )) );
+ connect( proc, TQ_SIGNAL(receivedStdout( TDEProcess*, char*, int )),
+ this, TQ_SLOT(receivedStdout( TDEProcess*, char*, int )) );
+ connect( proc, TQ_SIGNAL(receivedStderr( TDEProcess*, char*, int )),
+ this, TQ_SLOT(receivedStderr( TDEProcess*, char*, int )) );
+ connect( proc, TQ_SIGNAL(wroteStdin( TDEProcess* )),
+ this, TQ_SLOT(wroteStdin( TDEProcess* )) );
if ( !proc->start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) {
KMessageBox::error( 0, i18n( "Could not invoke the \"diff\" command." ) );