From c663b6440964f6ac48027143ac9e63298991f9d0 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:33:34 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- konqueror/shellcmdplugin/kshellcmddialog.cpp | 20 ++++++++++---------- konqueror/shellcmdplugin/kshellcmddialog.h | 4 ++-- konqueror/shellcmdplugin/kshellcmdexecutor.cpp | 24 ++++++++++++------------ konqueror/shellcmdplugin/kshellcmdexecutor.h | 12 ++++++------ konqueror/shellcmdplugin/kshellcmdplugin.cpp | 12 ++++++------ konqueror/shellcmdplugin/kshellcmdplugin.h | 2 +- 6 files changed, 37 insertions(+), 37 deletions(-) (limited to 'konqueror/shellcmdplugin') diff --git a/konqueror/shellcmdplugin/kshellcmddialog.cpp b/konqueror/shellcmdplugin/kshellcmddialog.cpp index b39e35cd3..eefa57337 100644 --- a/konqueror/shellcmdplugin/kshellcmddialog.cpp +++ b/konqueror/shellcmdplugin/kshellcmddialog.cpp @@ -17,9 +17,9 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include +#include +#include +#include #include #include @@ -28,15 +28,15 @@ #include "kshellcmddialog.h" #include "kshellcmdexecutor.h" -KShellCommandDialog::KShellCommandDialog(const QString& title, const QString& command, QWidget* parent, bool modal) +KShellCommandDialog::KShellCommandDialog(const TQString& title, const TQString& command, TQWidget* parent, bool modal) :KDialog(parent,"p",modal) { - QVBoxLayout * box=new QVBoxLayout (this,marginHint(),spacingHint()); + TQVBoxLayout * box=new TQVBoxLayout (this,marginHint(),spacingHint()); - QLabel *label=new QLabel(title,this); + TQLabel *label=new TQLabel(title,this); m_shell=new KShellCommandExecutor(command,this); - QHBox *buttonsBox=new QHBox(this); + TQHBox *buttonsBox=new TQHBox(this); buttonsBox->setSpacing(spacingHint()); cancelButton= new KPushButton(KStdGuiItem::cancel(), buttonsBox); @@ -54,9 +54,9 @@ KShellCommandDialog::KShellCommandDialog(const QString& title, const QString& co m_shell->setFocus(); - connect(cancelButton, SIGNAL(clicked()), m_shell, SLOT(slotFinished())); - connect(m_shell, SIGNAL(finished()), this, SLOT(disableStopButton())); - connect(closeButton,SIGNAL(clicked()), this, SLOT(slotClose())); + connect(cancelButton, TQT_SIGNAL(clicked()), m_shell, TQT_SLOT(slotFinished())); + connect(m_shell, TQT_SIGNAL(finished()), this, TQT_SLOT(disableStopButton())); + connect(closeButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose())); } KShellCommandDialog::~KShellCommandDialog() diff --git a/konqueror/shellcmdplugin/kshellcmddialog.h b/konqueror/shellcmdplugin/kshellcmddialog.h index 790c8e0d0..868028050 100644 --- a/konqueror/shellcmdplugin/kshellcmddialog.h +++ b/konqueror/shellcmdplugin/kshellcmddialog.h @@ -20,7 +20,7 @@ #ifndef SHELLCOMMANDDIALOG_H #define SHELLCOMMANDDIALOG_H -#include +#include #include #include @@ -31,7 +31,7 @@ class KShellCommandDialog:public KDialog { Q_OBJECT public: - KShellCommandDialog(const QString& title, const QString& command, QWidget* parent=0, bool modal=false); + KShellCommandDialog(const TQString& title, const TQString& command, TQWidget* parent=0, bool modal=false); virtual ~KShellCommandDialog(); //blocking int executeCommand(); diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp index c83488005..167f0f812 100644 --- a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp +++ b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp @@ -24,15 +24,15 @@ #include #include -#include +#include #include #include #include #include -KShellCommandExecutor::KShellCommandExecutor(const QString& command, QWidget* parent) -:QTextView(parent) +KShellCommandExecutor::KShellCommandExecutor(const TQString& command, TQWidget* parent) +:TQTextView(parent) ,m_shellProcess(0) ,m_command(command) ,m_readNotifier(0) @@ -73,7 +73,7 @@ int KShellCommandExecutor::exec() args+=m_command.local8Bit(); //kdDebug()<<"------- executing: "<fd(),QSocketNotifier::Read, this); - m_writeNotifier=new QSocketNotifier(m_shellProcess->fd(),QSocketNotifier::Write, this); + m_readNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Read, this); + m_writeNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Write, this); m_writeNotifier->setEnabled(false); - connect (m_readNotifier, SIGNAL(activated(int)), this,SLOT(readDataFromShell())); - connect (m_writeNotifier, SIGNAL(activated(int)), this,SLOT(writeDataToShell())); + connect (m_readNotifier, TQT_SIGNAL(activated(int)), this,TQT_SLOT(readDataFromShell())); + connect (m_writeNotifier, TQT_SIGNAL(activated(int)), this,TQT_SLOT(writeDataToShell())); return 1; } @@ -108,7 +108,7 @@ void KShellCommandExecutor::readDataFromShell() { //kdDebug()<<"***********************\n"<append(QString::fromLocal8Bit(buffer)); + this->append(TQString::fromLocal8Bit(buffer)); setTextFormat(PlainText); }; } @@ -117,11 +117,11 @@ void KShellCommandExecutor::writeDataToShell() { //kdDebug()<<"--------- writing ------------"<fd(),input,input.length()); ::write(m_shellProcess->fd(),"\n",1); } diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.h b/konqueror/shellcmdplugin/kshellcmdexecutor.h index 66b066a85..db19e4105 100644 --- a/konqueror/shellcmdplugin/kshellcmdexecutor.h +++ b/konqueror/shellcmdplugin/kshellcmdexecutor.h @@ -20,8 +20,8 @@ #ifndef SHELLCOMMANDEXECUTOR_H #define SHELLCOMMANDEXECUTOR_H -#include -#include +#include +#include class PtyProcess; class QSocketNotifier; @@ -30,7 +30,7 @@ class KShellCommandExecutor:public QTextView { Q_OBJECT public: - KShellCommandExecutor(const QString& command, QWidget* parent=0); + KShellCommandExecutor(const TQString& command, TQWidget* parent=0); virtual ~KShellCommandExecutor(); int exec(); signals: @@ -39,9 +39,9 @@ class KShellCommandExecutor:public QTextView void slotFinished(); protected: PtyProcess *m_shellProcess; - QString m_command; - QSocketNotifier *m_readNotifier; - QSocketNotifier *m_writeNotifier; + TQString m_command; + TQSocketNotifier *m_readNotifier; + TQSocketNotifier *m_writeNotifier; protected slots: void readDataFromShell(); void writeDataToShell(); diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp index b7f07ec81..7c39fb826 100644 --- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp +++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp @@ -26,15 +26,15 @@ #include #include -KShellCmdPlugin::KShellCmdPlugin( QObject* parent, const char* name, - const QStringList & ) +KShellCmdPlugin::KShellCmdPlugin( TQObject* parent, const char* name, + const TQStringList & ) : KParts::Plugin( parent, name ) { if (!kapp->authorize("shell_access")) return; new KAction( i18n( "&Execute Shell Command..." ), "run", CTRL+Key_E, this, - SLOT( slotExecuteShellCommand() ), actionCollection(), "executeshellcommand" ); + TQT_SLOT( slotExecuteShellCommand() ), actionCollection(), "executeshellcommand" ); } void KShellCmdPlugin::slotExecuteShellCommand() @@ -51,7 +51,7 @@ void KShellCmdPlugin::slotExecuteShellCommand() KMessageBox::sorry(part->widget(),i18n("Executing shell commands works only on local directories.")); return; } - QString path; + TQString path; if ( part->currentItem() ) { // Putting the complete path to the selected file isn't really necessary, @@ -65,12 +65,12 @@ void KShellCmdPlugin::slotExecuteShellCommand() path = url.path(); } bool ok; - QString cmd = KInputDialog::getText( i18n("Execute Shell Command"), + TQString cmd = KInputDialog::getText( i18n("Execute Shell Command"), i18n( "Execute shell command in current directory:" ), KProcess::quote( path ), &ok, part->widget() ); if ( ok ) { - QString chDir; + TQString chDir; chDir="cd "; chDir+=KProcess::quote(part->url().path()); chDir+="; "; diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.h b/konqueror/shellcmdplugin/kshellcmdplugin.h index 3e1415803..f942c82bf 100644 --- a/konqueror/shellcmdplugin/kshellcmdplugin.h +++ b/konqueror/shellcmdplugin/kshellcmdplugin.h @@ -26,7 +26,7 @@ class KShellCmdPlugin : public KParts::Plugin { Q_OBJECT public: - KShellCmdPlugin( QObject* parent, const char* name, const QStringList & ); + KShellCmdPlugin( TQObject* parent, const char* name, const TQStringList & ); ~KShellCmdPlugin() {} public slots: -- cgit v1.2.3