summaryrefslogtreecommitdiffstats
path: root/kjsembed
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:44:04 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:44:04 -0600
commit72a82366e0b94a52125683f3ee3a8ffd3691294b (patch)
tree787ee6497a0bf5e2e730f58d57dcbc9dc5377548 /kjsembed
parent43e3dc950c8050c2ba850b5707077790870aa734 (diff)
downloadtdebindings-72a82366e0b94a52125683f3ee3a8ffd3691294b.tar.gz
tdebindings-72a82366e0b94a52125683f3ee3a8ffd3691294b.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kjsembed')
-rw-r--r--kjsembed/builtins/resources.cpp12
-rw-r--r--kjsembed/docs/ChangeLog2
-rw-r--r--kjsembed/jsbuiltin_imp.cpp4
-rw-r--r--kjsembed/jsconsolewidget.cpp22
-rw-r--r--kjsembed/jsconsolewidget.h6
5 files changed, 23 insertions, 23 deletions
diff --git a/kjsembed/builtins/resources.cpp b/kjsembed/builtins/resources.cpp
index b7244d84..fb98f1ae 100644
--- a/kjsembed/builtins/resources.cpp
+++ b/kjsembed/builtins/resources.cpp
@@ -78,34 +78,34 @@ KJS::Value StdDirsImp::call( KJS::ExecState *exec, KJS::Object &/*self*/, const
{
TQString arg0 = extractTQString(exec, args, 0);
TQString arg1 = extractTQString(exec, args, 1);
- TQString path = KGlobal::dirs ()->findResource(arg0.latin1(), arg1);
+ TQString path = TDEGlobal::dirs ()->findResource(arg0.latin1(), arg1);
return KJS::String( path );
}
case StdDirsImp::addResourceType:
{
TQString arg0 = extractTQString(exec, args, 0);
TQString arg1 = extractTQString(exec, args, 1);
- bool isOk = KGlobal::dirs ()->addResourceType(arg0.latin1(), arg1);
+ bool isOk = TDEGlobal::dirs ()->addResourceType(arg0.latin1(), arg1);
return KJS::Boolean( isOk );
}
case StdDirsImp::kde_default:
{
TQString arg0 = extractTQString(exec, args, 0);
- TQString path = KGlobal::dirs ()->kde_default(arg0.latin1());
+ TQString path = TDEGlobal::dirs ()->kde_default(arg0.latin1());
return KJS::String( path );
}
case StdDirsImp::addResourceDir:
{
TQString arg0 = extractTQString(exec, args, 0);
TQString arg1 = extractTQString(exec, args, 1);
- bool isOk = KGlobal::dirs ()->addResourceDir(arg0.latin1(), arg1);
+ bool isOk = TDEGlobal::dirs ()->addResourceDir(arg0.latin1(), arg1);
return KJS::Boolean( isOk );
}
case StdDirsImp::findResourceDir:
{
TQString arg0 = extractTQString(exec, args, 0);
TQString arg1 = extractTQString(exec, args, 1);
- TQString path = KGlobal::dirs ()->findResourceDir(arg0.latin1(), arg1);
+ TQString path = TDEGlobal::dirs ()->findResourceDir(arg0.latin1(), arg1);
return KJS::String( path );
}
case StdDirsImp::saveLocation:
@@ -113,7 +113,7 @@ KJS::Value StdDirsImp::call( KJS::ExecState *exec, KJS::Object &/*self*/, const
TQString arg0 = extractTQString(exec, args, 0);
TQString arg1 = extractTQString(exec, args, 1);
bool arg2 = (args.size() > 2) ? args[2].toBoolean(exec) : true;
- TQString path = KGlobal::dirs ()->saveLocation(arg0.latin1(), arg1, arg2);
+ TQString path = TDEGlobal::dirs ()->saveLocation(arg0.latin1(), arg1, arg2);
return KJS::String( path );
}
case StdDirsImp::makeDir:
diff --git a/kjsembed/docs/ChangeLog b/kjsembed/docs/ChangeLog
index ecf3c561..c4f23b28 100644
--- a/kjsembed/docs/ChangeLog
+++ b/kjsembed/docs/ChangeLog
@@ -965,7 +965,7 @@
2004-05-19 Wednesday 18:54 rich
- Fixed a couple of naming errors in TQProcess's signals that resulted from
- the conversion from KProcess.
+ the conversion from TDEProcess.
2004-05-19 Wednesday 18:31 rich
diff --git a/kjsembed/jsbuiltin_imp.cpp b/kjsembed/jsbuiltin_imp.cpp
index 7cf96082..27aad2b4 100644
--- a/kjsembed/jsbuiltin_imp.cpp
+++ b/kjsembed/jsbuiltin_imp.cpp
@@ -241,8 +241,8 @@ KJS::Value JSBuiltInImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
#ifndef QT_ONLY
// Scan $TDEDIRS/share/apps/$APPNAME/
// Scan $TDEDIRS/share/apps/kjsembed/
- KGlobal::dirs()->addResourceType("kjsembed", KStandardDirs::kde_default("data") +"/kjsembed/");
- TQString fname = KGlobal::dirs ()->findResource ("kjsembed", TQString(arg0));
+ TDEGlobal::dirs()->addResourceType("kjsembed", KStandardDirs::kde_default("data") +"/kjsembed/");
+ TQString fname = TDEGlobal::dirs ()->findResource ("kjsembed", TQString(arg0));
kdDebug(80001) << "Loading: " << fname << endl;
diff --git a/kjsembed/jsconsolewidget.cpp b/kjsembed/jsconsolewidget.cpp
index d2978a84..839bf9a8 100644
--- a/kjsembed/jsconsolewidget.cpp
+++ b/kjsembed/jsconsolewidget.cpp
@@ -64,8 +64,8 @@ JSConsoleWidget::~JSConsoleWidget()
void JSConsoleWidget::createView()
{
- TQPixmap px( KGlobal::iconLoader()->loadIcon("konsole", KIcon::NoGroup, KIcon::SizeSmall) );
- TQPixmap pxl( KGlobal::iconLoader()->loadIcon("konsole", KIcon::NoGroup, KIcon::SizeLarge) );
+ TQPixmap px( TDEGlobal::iconLoader()->loadIcon("konsole", KIcon::NoGroup, KIcon::SizeSmall) );
+ TQPixmap pxl( TDEGlobal::iconLoader()->loadIcon("konsole", KIcon::NoGroup, KIcon::SizeLarge) );
setIcon( px );
KWin::setIcons( winId(), pxl, px );
@@ -192,14 +192,14 @@ bool JSConsoleWidget::run( const TQString &cmd )
proc = new KShellProcess("/bin/sh");
*proc << cmd;
- connect( proc, TQT_SIGNAL( processExited(KProcess *) ), TQT_SLOT( childExited() ) );
- connect( proc, TQT_SIGNAL( receivedStdout(KProcess *, char *, int) ),
- this, TQT_SLOT( receivedStdOutput(KProcess *, char *, int) ) );
- connect( proc, TQT_SIGNAL( receivedStderr(KProcess *, char *, int) ),
- this, TQT_SLOT( receivedStdError(KProcess *, char *, int) ) );
+ connect( proc, TQT_SIGNAL( processExited(TDEProcess *) ), TQT_SLOT( childExited() ) );
+ connect( proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int) ),
+ this, TQT_SLOT( receivedStdOutput(TDEProcess *, char *, int) ) );
+ connect( proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int) ),
+ this, TQT_SLOT( receivedStdError(TDEProcess *, char *, int) ) );
- return proc->start( KProcess::NotifyOnExit,
- KProcess::Communication( KProcess::Stdout|KProcess::Stderr ));
+ return proc->start( TDEProcess::NotifyOnExit,
+ TDEProcess::Communication( TDEProcess::Stdout|TDEProcess::Stderr ));
}
@@ -222,13 +222,13 @@ void JSConsoleWidget::childExited()
proc = 0;
}
-void JSConsoleWidget::receivedStdOutput( KProcess *, char *buffer, int buflen )
+void JSConsoleWidget::receivedStdOutput( TDEProcess *, char *buffer, int buflen )
{
TQCString buf = TQCString( buffer, buflen+1 );
println( TQString(buf) );
}
-void JSConsoleWidget::receivedStdError( KProcess *, char *buffer, int buflen )
+void JSConsoleWidget::receivedStdError( TDEProcess *, char *buffer, int buflen )
{
TQCString buf = TQCString( buffer, buflen+1 );
warn( TQString(buf) );
diff --git a/kjsembed/jsconsolewidget.h b/kjsembed/jsconsolewidget.h
index b0ed7787..b1beef1c 100644
--- a/kjsembed/jsconsolewidget.h
+++ b/kjsembed/jsconsolewidget.h
@@ -30,7 +30,7 @@ class TQHBox;
class KLineEdit;
class KPopupTitle;
-class KProcess;
+class TDEProcess;
class KShellProcess;
class KTextEdit;
@@ -126,10 +126,10 @@ protected slots:
void childExited();
/** Called when the process sends message to stdout. */
- void receivedStdOutput(KProcess *, char *, int);
+ void receivedStdOutput(TDEProcess *, char *, int);
/** Called when the process sends message to stderr. */
- void receivedStdError(KProcess *, char *, int);
+ void receivedStdError(TDEProcess *, char *, int);
private:
KJSEmbedPart *js;