From 72a82366e0b94a52125683f3ee3a8ffd3691294b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:44:04 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kjsembed/builtins/resources.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kjsembed/builtins/resources.cpp') 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: -- cgit v1.2.1