summaryrefslogtreecommitdiffstats
path: root/kompare
diff options
context:
space:
mode:
Diffstat (limited to 'kompare')
-rw-r--r--kompare/ChangeLog2
-rw-r--r--kompare/kompare_shell.cpp4
-rw-r--r--kompare/komparenavtreepart/komparenavtreepart.cpp2
-rw-r--r--kompare/libdialogpages/filespage.cpp2
-rw-r--r--kompare/libdialogpages/viewpage.cpp2
-rw-r--r--kompare/libdialogpages/viewsettings.cpp2
-rw-r--r--kompare/libdiff2/komparemodellist.cpp2
-rw-r--r--kompare/libdiff2/kompareprocess.cpp36
-rw-r--r--kompare/libdiff2/kompareprocess.h8
9 files changed, 30 insertions, 30 deletions
diff --git a/kompare/ChangeLog b/kompare/ChangeLog
index 76d8edf6..3ff4c222 100644
--- a/kompare/ChangeLog
+++ b/kompare/ChangeLog
@@ -270,7 +270,7 @@ Jul 15, 2002 : Otto Bruggeman
* Removed some code duplication
* Fixed diff output parsing with Common subdirectories in it
* Fixed Copyright years in the about box (thanks Carsten Niehaus)
- * Removed the KShellProcess and replaced it with a KProcess
+ * Removed the KShellProcess and replaced it with a TDEProcess
Feb 18, 2002 : Otto Bruggeman
* Fixed scrolling with a wheel mouse in the kompare(list)view and
diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp
index ad114109..a1c70d90 100644
--- a/kompare/kompare_shell.cpp
+++ b/kompare/kompare_shell.cpp
@@ -472,7 +472,7 @@ void KompareShell::optionsConfigureKeys()
void KompareShell::optionsConfigureToolbars()
{
- saveMainWindowSettings( KGlobal::config(), autoSaveGroup() );
+ saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
// use the standard toolbar editor
KEditToolbar dlg(factory());
connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(newToolbarConfig()));
@@ -481,7 +481,7 @@ void KompareShell::optionsConfigureToolbars()
void KompareShell::newToolbarConfig()
{
- applyMainWindowSettings( KGlobal::config(), autoSaveGroup() );
+ applyMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
}
#include "kompare_shell.moc"
diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp
index 3dca1b12..fe231bb2 100644
--- a/kompare/komparenavtreepart/komparenavtreepart.cpp
+++ b/kompare/komparenavtreepart/komparenavtreepart.cpp
@@ -682,7 +682,7 @@ KParts::Part* KompareNavTreePartFactory::createPartObject( TQWidget* parentWidge
// Create an instance of our Part
KompareNavTreePart* obj = new KompareNavTreePart( parentWidget, widgetName );
- KGlobal::locale()->insertCatalogue("kompare");
+ TDEGlobal::locale()->insertCatalogue("kompare");
return obj;
}
diff --git a/kompare/libdialogpages/filespage.cpp b/kompare/libdialogpages/filespage.cpp
index 7ccd7a69..9fa58a35 100644
--- a/kompare/libdialogpages/filespage.cpp
+++ b/kompare/libdialogpages/filespage.cpp
@@ -52,7 +52,7 @@ FilesPage::FilesPage( TQWidget* parent ) : PageBase( parent ), m_URLChanged( fal
m_thirdGB = new TQGroupBox( 1, Qt::Vertical, i18n( "Encoding" ), page );
m_encodingComboBox = new TQComboBox( false, m_thirdGB, "encoding_combobox" );
- m_encodingComboBox->insertStringList( KGlobal::charsets()->availableEncodingNames() );
+ m_encodingComboBox->insertStringList( TDEGlobal::charsets()->availableEncodingNames() );
layout->addWidget( m_firstGB );
layout->addWidget( m_secondGB );
diff --git a/kompare/libdialogpages/viewpage.cpp b/kompare/libdialogpages/viewpage.cpp
index 1deb9e21..19f5b057 100644
--- a/kompare/libdialogpages/viewpage.cpp
+++ b/kompare/libdialogpages/viewpage.cpp
@@ -172,7 +172,7 @@ void ViewPage::setDefaults()
m_snolSpinBox->setValue ( 3 );
m_tabSpinBox->setValue ( 4 );
- m_fontCombo->setCurrentFont ( KGlobalSettings::fixedFont().family() );
+ m_fontCombo->setCurrentFont ( TDEGlobalSettings::fixedFont().family() );
m_fontSizeSpinBox->setValue ( 10 );
}
diff --git a/kompare/libdialogpages/viewsettings.cpp b/kompare/libdialogpages/viewsettings.cpp
index 403746b1..85420d53 100644
--- a/kompare/libdialogpages/viewsettings.cpp
+++ b/kompare/libdialogpages/viewsettings.cpp
@@ -56,7 +56,7 @@ void ViewSettings::loadSettings( KConfig* config )
m_scrollNoOfLines = cfg.readNumEntry ( "ScrollNoOfLines", 3 );
m_tabToNumberOfSpaces = cfg.readNumEntry ( "TabToNumberOfSpaces", 4 );
- TQFont stdFixed = KGlobalSettings::fixedFont();
+ TQFont stdFixed = TDEGlobalSettings::fixedFont();
stdFixed.setPointSize( 10 );
m_font = cfg.readFontEntry ( "TextFont", &stdFixed );
}
diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp
index 90aff45b..4d76e07f 100644
--- a/kompare/libdiff2/komparemodellist.cpp
+++ b/kompare/libdiff2/komparemodellist.cpp
@@ -417,7 +417,7 @@ void KompareModelList::setEncoding( const TQString& encoding )
else
{
kdDebug() << "Encoding : " << encoding << endl;
- m_textCodec = KGlobal::charsets()->codecForName( encoding.latin1() );
+ m_textCodec = TDEGlobal::charsets()->codecForName( encoding.latin1() );
kdDebug() << "TextCodec: " << m_textCodec << endl;
if ( !m_textCodec )
m_textCodec = TQTextCodec::codecForLocale();
diff --git a/kompare/libdiff2/kompareprocess.cpp b/kompare/libdiff2/kompareprocess.cpp
index db165ae5..f66b4e0d 100644
--- a/kompare/libdiff2/kompareprocess.cpp
+++ b/kompare/libdiff2/kompareprocess.cpp
@@ -31,7 +31,7 @@
#include "kompareprocess.h"
KompareProcess::KompareProcess( DiffSettings* diffSettings, enum Kompare::DiffMode mode, TQString source, TQString destination, TQString dir )
- : KProcess(),
+ : TDEProcess(),
m_diffSettings( diffSettings ),
m_mode( mode ),
m_textDecoder( 0 )
@@ -39,14 +39,14 @@ KompareProcess::KompareProcess( DiffSettings* diffSettings, enum Kompare::DiffMo
setUseShell( true );
// connect the stdout and stderr signals
- connect( this, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ),
- TQT_SLOT ( slotReceivedStdout( KProcess*, char*, int ) ) );
- connect( this, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ),
- TQT_SLOT ( slotReceivedStderr( KProcess*, char*, int ) ) );
+ connect( this, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
+ TQT_SLOT ( slotReceivedStdout( TDEProcess*, char*, int ) ) );
+ connect( this, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
+ TQT_SLOT ( slotReceivedStderr( TDEProcess*, char*, int ) ) );
// connect the signal that indicates that the proces has exited
- connect( this, TQT_SIGNAL( processExited( KProcess* ) ),
- TQT_SLOT ( slotProcessExited( KProcess* ) ) );
+ connect( this, TQT_SIGNAL( processExited( TDEProcess* ) ),
+ TQT_SLOT ( slotProcessExited( TDEProcess* ) ) );
*this << "LANG=C";
@@ -66,8 +66,8 @@ KompareProcess::KompareProcess( DiffSettings* diffSettings, enum Kompare::DiffMo
// Write file names
*this << "--";
- *this << KProcess::quote( constructRelativePath( dir, source ) );
- *this << KProcess::quote( constructRelativePath( dir, destination ) );
+ *this << TDEProcess::quote( constructRelativePath( dir, source ) );
+ *this << TDEProcess::quote( constructRelativePath( dir, destination ) );
}
void KompareProcess::writeDefaultCommandLine()
@@ -86,7 +86,7 @@ void KompareProcess::writeDefaultCommandLine()
void KompareProcess::writeCommandLine()
{
- // load the executable into the KProcess
+ // load the executable into the TDEProcess
if ( m_diffSettings->m_diffProgram.isEmpty() )
{
kdDebug(8101) << "Using the first diff in the path..." << endl;
@@ -157,7 +157,7 @@ void KompareProcess::writeCommandLine()
if ( m_diffSettings->m_ignoreRegExp && !m_diffSettings->m_ignoreRegExpText.isEmpty() )
{
- *this << "-I " << KProcess::quote( m_diffSettings->m_ignoreRegExpText );
+ *this << "-I " << TDEProcess::quote( m_diffSettings->m_ignoreRegExpText );
}
if ( m_diffSettings->m_showCFunctionChange )
@@ -192,13 +192,13 @@ void KompareProcess::writeCommandLine()
TQStringList::ConstIterator end = m_diffSettings->m_excludeFilePatternList.end();
for ( ; it != end; ++it )
{
- *this << "-x" << KProcess::quote( *it );
+ *this << "-x" << TDEProcess::quote( *it );
}
}
if ( m_diffSettings->m_excludeFilesFile && !m_diffSettings->m_excludeFilesFileURL.isEmpty() )
{
- *this << "-X" << KProcess::quote( m_diffSettings->m_excludeFilesFileURL );
+ *this << "-X" << TDEProcess::quote( m_diffSettings->m_excludeFilesFileURL );
}
}
@@ -214,7 +214,7 @@ void KompareProcess::setEncoding( const TQString& encoding )
}
else
{
- TQTextCodec* textCodec = KGlobal::charsets()->codecForName( encoding.latin1() );
+ TQTextCodec* textCodec = TDEGlobal::charsets()->codecForName( encoding.latin1() );
if ( textCodec )
m_textDecoder = textCodec->makeDecoder();
else
@@ -226,7 +226,7 @@ void KompareProcess::setEncoding( const TQString& encoding )
}
}
-void KompareProcess::slotReceivedStdout( KProcess* /* process */, char* buffer, int length )
+void KompareProcess::slotReceivedStdout( TDEProcess* /* process */, char* buffer, int length )
{
// add all output to m_stdout
if ( m_textDecoder )
@@ -235,7 +235,7 @@ void KompareProcess::slotReceivedStdout( KProcess* /* process */, char* buffer,
kdDebug(8101) << "KompareProcess::slotReceivedStdout : No decoder !!!" << endl;
}
-void KompareProcess::slotReceivedStderr( KProcess* /* process */, char* buffer, int length )
+void KompareProcess::slotReceivedStderr( TDEProcess* /* process */, char* buffer, int length )
{
// add all output to m_stderr
if ( m_textDecoder )
@@ -253,10 +253,10 @@ bool KompareProcess::start()
cmdLine += "\"" + (*it) + "\" ";
kdDebug(8101) << cmdLine << endl;
#endif
- return( KProcess::start( KProcess::NotifyOnExit, KProcess::AllOutput ) );
+ return( TDEProcess::start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) );
}
-void KompareProcess::slotProcessExited( KProcess* /* proc */ )
+void KompareProcess::slotProcessExited( TDEProcess* /* proc */ )
{
// exit status of 0: no differences
// 1: some differences
diff --git a/kompare/libdiff2/kompareprocess.h b/kompare/libdiff2/kompareprocess.h
index 8f1fca8b..e7fc781c 100644
--- a/kompare/libdiff2/kompareprocess.h
+++ b/kompare/libdiff2/kompareprocess.h
@@ -28,7 +28,7 @@ class TQTextCodec;
class DiffSettings;
-class KompareProcess : public KProcess, public KompareFunctions
+class KompareProcess : public TDEProcess, public KompareFunctions
{
Q_OBJECT
@@ -53,9 +53,9 @@ protected:
void writeCommandLine();
protected slots:
- void slotReceivedStdout( KProcess*, char*, int );
- void slotReceivedStderr( KProcess*, char*, int );
- void slotProcessExited( KProcess* proc );
+ void slotReceivedStdout( TDEProcess*, char*, int );
+ void slotReceivedStderr( TDEProcess*, char*, int );
+ void slotProcessExited( TDEProcess* proc );
private:
DiffSettings* m_diffSettings;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-27 14:06:35 +0000