summaryrefslogtreecommitdiffstats
path: root/parts/diff
diff options
context:
space:
mode:
Diffstat (limited to 'parts/diff')
-rw-r--r--parts/diff/CMakeLists.txt7
-rw-r--r--parts/diff/diffdlg.h2
-rw-r--r--parts/diff/diffpart.cpp32
-rw-r--r--parts/diff/diffpart.h2
-rw-r--r--parts/diff/diffwidget.cpp28
-rw-r--r--parts/diff/diffwidget.h4
-rw-r--r--parts/diff/kdevdiff.desktop82
7 files changed, 46 insertions, 111 deletions
diff --git a/parts/diff/CMakeLists.txt b/parts/diff/CMakeLists.txt
index 09987fd7..6802ffe8 100644
--- a/parts/diff/CMakeLists.txt
+++ b/parts/diff/CMakeLists.txt
@@ -26,7 +26,12 @@ link_directories(
##### other data ################################
-install( FILES kdevdiff.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+tde_create_translated_desktop(
+ SOURCE kdevdiff.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+ PO_DIR tdevelop-desktops
+)
+
install( FILES kdevdiff.rc DESTINATION ${DATA_INSTALL_DIR}/kdevdiff )
diff --git a/parts/diff/diffdlg.h b/parts/diff/diffdlg.h
index ee15011a..87c37211 100644
--- a/parts/diff/diffdlg.h
+++ b/parts/diff/diffdlg.h
@@ -19,7 +19,7 @@ class DiffWidget;
class DiffDlg : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
index 01c703d0..480a2da5 100644
--- a/parts/diff/diffpart.cpp
+++ b/parts/diff/diffpart.cpp
@@ -19,7 +19,7 @@
#include <kdevgenericfactory.h>
#include <tdeaction.h>
#include <tdefiledialog.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tdeio/jobclasses.h>
#include <tdeio/job.h>
#include <tdeparts/part.h>
@@ -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." ) );
diff --git a/parts/diff/diffpart.h b/parts/diff/diffpart.h
index 6fe89efe..3bccf1a1 100644
--- a/parts/diff/diffpart.h
+++ b/parts/diff/diffpart.h
@@ -26,7 +26,7 @@ class TQCString;
class DiffPart : public KDevDiffFrontend
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp
index b52b8b25..2b7e5fc7 100644
--- a/parts/diff/diffwidget.cpp
+++ b/parts/diff/diffwidget.cpp
@@ -44,7 +44,7 @@ TQStringList KDiffTextEdit::extPartsTranslated;
KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( parent, name )
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup( "Diff" );
_highlight = config->readBoolEntry( "Highlight", true );
@@ -53,7 +53,7 @@ KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit(
KDiffTextEdit::~KDiffTextEdit()
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup( "Diff" );
config->writeEntry( "Highlight", _highlight );
@@ -78,19 +78,19 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p )
}
if ( !extPartsTranslated.isEmpty() )
popup->insertSeparator( i );
- connect( popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupActivated(int)) );
+ connect( popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(popupActivated(int)) );
- popup->insertItem( SmallIconSet( "document-save-as" ), i18n( "&Save As..." ), this, TQT_SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 );
+ popup->insertItem( SmallIconSet( "document-save-as" ), i18n( "&Save As..." ), this, TQ_SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 );
popup->setItemEnabled( POPUP_BASE - 2, length() > 0 );
popup->insertSeparator( 1 );
- popup->insertItem( i18n( "Highlight Syntax" ), this, TQT_SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 );
+ popup->insertItem( i18n( "Highlight Syntax" ), this, TQ_SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 );
popup->setItemChecked( POPUP_BASE - 1, _highlight );
popup->insertSeparator( 3 );
popup->insertSeparator();
- popup->insertItem( i18n("Hide view"), parent(), TQT_SLOT(hideView()) );
+ popup->insertItem( i18n("Hide view"), parent(), TQ_SLOT(hideView()) );
return popup;
}
@@ -190,7 +190,7 @@ DiffWidget::DiffWidget( DiffPart * part, TQWidget *parent, const char *name, WFl
te->setReadOnly( true );
te->setTextFormat( TQTextEdit::PlainText );
// te->setMinimumSize( 300, 200 );
- connect( te, TQT_SIGNAL(externalPartRequested(const TQString&)), this, TQT_SLOT(loadExtPart(const TQString&)) );
+ connect( te, TQ_SIGNAL(externalPartRequested(const TQString&)), this, TQ_SLOT(loadExtPart(const TQString&)) );
TQVBoxLayout* layout = new TQVBoxLayout( this );
layout->addWidget( te );
@@ -229,7 +229,7 @@ void DiffWidget::loadExtPart( const TQString& partName )
if ( !extService )
return;
- extPart = KParts::ComponentFactory::createPartInstanceFromService<KParts::ReadOnlyPart>( extService, this, 0, TQT_TQOBJECT(this), 0 );
+ extPart = KParts::ComponentFactory::createPartInstanceFromService<KParts::ReadOnlyPart>( extService, this, 0, this, 0 );
if ( !extPart || !extPart->widget() )
return;
@@ -309,10 +309,10 @@ void DiffWidget::openURL( const KURL& url )
if ( !job )
return;
- connect( job, TQT_SIGNAL(data( TDEIO::Job *, const TQByteArray & )),
- this, TQT_SLOT(slotAppend( TDEIO::Job*, const TQByteArray& )) );
- connect( job, TQT_SIGNAL(result( TDEIO::Job * )),
- this, TQT_SLOT(slotFinished()) );
+ connect( job, TQ_SIGNAL(data( TDEIO::Job *, const TQByteArray & )),
+ this, TQ_SLOT(slotAppend( TDEIO::Job*, const TQByteArray& )) );
+ connect( job, TQ_SIGNAL(result( TDEIO::Job * )),
+ this, TQ_SLOT(slotFinished()) );
}
void DiffWidget::contextMenuEvent( TQContextMenuEvent* /* e */ )
@@ -321,9 +321,9 @@ void DiffWidget::contextMenuEvent( TQContextMenuEvent* /* e */ )
if ( !te->isVisible() )
{
- popup->insertItem( i18n("Display &Raw Output"), this, TQT_SLOT(showTextEdit()) );
+ popup->insertItem( i18n("Display &Raw Output"), this, TQ_SLOT(showTextEdit()) );
popup->insertSeparator();
- popup->insertItem( i18n("Hide view"), this, TQT_SLOT(hideView()) );
+ popup->insertItem( i18n("Hide view"), this, TQ_SLOT(hideView()) );
}
popup->exec( TQCursor::pos() );
diff --git a/parts/diff/diffwidget.h b/parts/diff/diffwidget.h
index b021e516..43b9f90f 100644
--- a/parts/diff/diffwidget.h
+++ b/parts/diff/diffwidget.h
@@ -32,7 +32,7 @@ namespace KParts {
// Helper class that displays a modified RMB popup menu
class KDiffTextEdit: public TQTextEdit
{
- Q_OBJECT
+ TQ_OBJECT
public:
KDiffTextEdit( TQWidget* parent = 0, const char* name = 0 );
@@ -61,7 +61,7 @@ private:
class DiffWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/parts/diff/kdevdiff.desktop b/parts/diff/kdevdiff.desktop
index 02aab0cd..b47f7d5f 100644
--- a/parts/diff/kdevdiff.desktop
+++ b/parts/diff/kdevdiff.desktop
@@ -1,82 +1,12 @@
[Desktop Entry]
-Type=Service
-Exec=blubb
-Comment=Difference Viewer
-Comment[ca]=Visor de diferències
-Comment[da]=Diff-fremviser
-Comment[de]=Betrachter für Abweichungen
-Comment[el]=Προβολέας διαφορών
-Comment[es]=Visor de diferencias
-Comment[et]=Erinevuste näitaja
-Comment[eu]=Desberdintasun ikustailea
-Comment[fa]=مشاهده‌گر تفاوت
-Comment[fr]=Afficheur de différences
-Comment[ga]=Amharcán Difríochtaí
-Comment[gl]=Visor de diferenzas
-Comment[hi]=भिन्नता प्रदर्शक
-Comment[hu]=Fájlok közötti eltérések megjelenítése
-Comment[it]=Visualizzatore di differenze
-Comment[ja]=差分ビューア
-Comment[ms]=Pelihat Perbezaan
-Comment[nds]=En Verscheelkieker
-Comment[ne]=फरक दृश्यकर्ता
-Comment[nl]=Weergave van verschillen
-Comment[pl]=Przeglądarka różnic
-Comment[pt]=Visualizador de Diferenças
-Comment[pt_BR]=Visualizador de Diferenças
-Comment[ru]=Просмотр различий
-Comment[sk]=Prezerač rozdielov
-Comment[sl]=Pregledovalnik razlik
-Comment[sr]=Програм за прегледање разлика
-Comment[sr@Latn]=Program za pregledanje razlika
-Comment[sv]=Visning av jämförelser
-Comment[ta]=பாகுபாடு காட்சியாளர்
-Comment[tg]=Намоишгари фарқкунанда
-Comment[tr]=Fark Görüntüleyicisi
-Comment[zh_CN]=差别查看器
-Comment[zh_TW]=比較檢視器
Name=KDevDiff
-Name[da]=TDevelop diff-fremviser
-Name[de]=Abweichungsansicht (TDevelop)
-Name[hi]=के-डेव-डिफ़
-Name[nds]=TDevelop-Verscheelkieker
-Name[sk]=KDev rozdiel
-Name[sv]=TDevelop jämför
-Name[zh_TW]=TDevelop 比較
+
GenericName=Difference Viewer
-GenericName[ca]=Visor de diferències
-GenericName[da]=Diff-fremviser
-GenericName[de]=Betrachter für Abweichungen
-GenericName[el]=Προβολέας διαφορών
-GenericName[es]=Visor de diferencias
-GenericName[et]=Erinevuste näitaja
-GenericName[eu]=Desberdintasun ikustailea
-GenericName[fa]=مشاهده‌گر تفاوت
-GenericName[fr]=Afficheur de différences
-GenericName[ga]=Amharcán Difríochtaí
-GenericName[gl]=Visor de diferenzas
-GenericName[hi]=भिन्नता प्रदर्शक
-GenericName[hu]=Diff-megjelenítő
-GenericName[it]=Visualizzatore delle differenze
-GenericName[ja]=差分ビューア
-GenericName[ms]=Pelihat Perbezaan
-GenericName[nds]=Verscheelkieker
-GenericName[ne]=फरक दृश्यकर्ता
-GenericName[nl]=Weergave van verschillen
-GenericName[pl]=Przeglądarka różnic
-GenericName[pt]=Visualizador de Diferenças
-GenericName[pt_BR]=Visualizador de Diferenças
-GenericName[ru]=Просмотр различий
-GenericName[sk]=Prezerač rozdielov
-GenericName[sl]=Pregledovalnik razlik
-GenericName[sr]=Програм за прегледање разлика
-GenericName[sr@Latn]=Program za pregledanje razlika
-GenericName[sv]=Visning av jämförelser
-GenericName[ta]=வெவ்வேறு பார்வையாளர்கள்
-GenericName[tg]=Намоишгари фарқкунанда
-GenericName[tr]=Fark Görüntüleyicisi
-GenericName[zh_CN]=差别查看器
-GenericName[zh_TW]=比較檢視器
+
+Comment=Difference Viewer
+
+Type=Service
+Exec=blubb
X-TDE-ServiceTypes=TDevelop/DiffFrontend
X-TDE-Library=libkdevdiff
X-TDevelop-Version=5
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-21 00:47:02 +0000