Browse Source

Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
1e90902cbb
4 changed files with 16 additions and 16 deletions
  1. 2
    2
      krename/commandplugin.cpp
  2. 2
    2
      krename/kmyhistorycombo.cpp
  3. 8
    8
      krename/undodialog.cpp
  4. 4
    4
      krename/undodialog.h

+ 2
- 2
krename/commandplugin.cpp View File

@@ -130,9 +130,9 @@ TQString CommandPlugin::processFile( BatchRenamer* b, int i, TQString, int )
proc << c;
if( noblock )
proc.start( KProcess::DontCare, KProcess::NoCommunication );
proc.start( TDEProcess::DontCare, TDEProcess::NoCommunication );
else
proc.start( KProcess::Block, KProcess::NoCommunication );
proc.start( TDEProcess::Block, TDEProcess::NoCommunication );

proc.resume();


+ 2
- 2
krename/kmyhistorycombo.cpp View File

@@ -52,8 +52,8 @@ KMyHistoryCombo::KMyHistoryCombo( bool customPopup, TQWidget* parent, const char
setHistoryItems( history );

completionObject()->setItems( ( completion.isEmpty() ? history : completion ) );
setCompletionMode( (KGlobalSettings::Completion)config->readNumEntry( "CompletionMode",
KGlobalSettings::completionMode() ) );
setCompletionMode( (TDEGlobalSettings::Completion)config->readNumEntry( "CompletionMode",
TDEGlobalSettings::completionMode() ) );
connect( this, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( textChangedGovernor() ) );
connect( m_timer, TQT_SIGNAL( timeout() ), this, TQT_SIGNAL( delayedTextChanged() ) );

+ 8
- 8
krename/undodialog.cpp View File

@@ -77,24 +77,24 @@ void UndoDialog::start()
== KMessageBox::Cancel )
return;

KProcess *proc = new KProcess;
TDEProcess *proc = new TDEProcess;
*proc << scriptname->url() << "--krename";

enableButton( KDialogBase::User1, false );

if( !proc->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
if( !proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) {
KMessageBox::sorry( this, i18n("Unable to start the given undo script!") );
enableButton( KDialogBase::User1, true );
delete proc;
return;
}
proc->resume();
connect( proc, TQT_SIGNAL( receivedStdout( KProcess*, char*, int) ), this, TQT_SLOT( receive( KProcess*, char*, int ) ) );
connect( proc, TQT_SIGNAL( receivedStderr( KProcess*, char*, int) ), this, TQT_SLOT( receiveErr( KProcess*, char*, int ) ) );
connect( proc, TQT_SIGNAL( processExited( KProcess* ) ), this, TQT_SLOT( finished( KProcess* ) ) );
connect( proc, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int) ), this, TQT_SLOT( receive( TDEProcess*, char*, int ) ) );
connect( proc, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int) ), this, TQT_SLOT( receiveErr( TDEProcess*, char*, int ) ) );
connect( proc, TQT_SIGNAL( processExited( TDEProcess* ) ), this, TQT_SLOT( finished( TDEProcess* ) ) );
}

void UndoDialog::receive( KProcess*, char* buffer, int len )
void UndoDialog::receive( TDEProcess*, char* buffer, int len )
{
TQString text;
for( int i = 0; i < len; i++ )
@@ -103,7 +103,7 @@ void UndoDialog::receive( KProcess*, char* buffer, int len )
browser->setText( browser->text() + text + "<br>");
}

void UndoDialog::receiveErr( KProcess*, char* buffer, int len )
void UndoDialog::receiveErr( TDEProcess*, char* buffer, int len )
{
TQString text = "<b>";
for( int i = 0; i < len; i++ )
@@ -112,7 +112,7 @@ void UndoDialog::receiveErr( KProcess*, char* buffer, int len )
browser->setText( browser->text() + text + "</b><br>");
}

void UndoDialog::finished( KProcess* p )
void UndoDialog::finished( TDEProcess* p )
{
delete p;
KMessageBox::information( this, i18n("Finished successfully") );

+ 4
- 4
krename/undodialog.h View File

@@ -21,7 +21,7 @@
#include <kdialogbase.h>

class KPushButton;
class KProcess;
class TDEProcess;
class KTextBrowser;
class KURLRequester;
class TQVBoxLayout;
@@ -42,9 +42,9 @@ class UndoDialog : public KDialogBase
void start();
private slots:
void receive( KProcess*, char* buffer, int len );
void receiveErr( KProcess*, char* buffer, int len );
void finished( KProcess* p );
void receive( TDEProcess*, char* buffer, int len );
void receiveErr( TDEProcess*, char* buffer, int len );
void finished( TDEProcess* p );
void enableControls();
private:

Loading…
Cancel
Save