From 545706afdcf29b8f584e78275452cca715e284db Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:02:53 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- kjsembed/bindings/Makefile.am | 2 +- kjsembed/bindings/bindings.pro | 4 +- kjsembed/bindings/dcop_imp.cpp | 2 +- kjsembed/bindings/kconfig_imp.cpp | 536 ---------------------------- kjsembed/bindings/kconfig_imp.h | 135 ------- kjsembed/bindings/netaccess_imp.cpp | 2 +- kjsembed/bindings/tdeconfig_imp.cpp | 536 ++++++++++++++++++++++++++++ kjsembed/bindings/tdeconfig_imp.h | 135 +++++++ kjsembed/builtins/stddialog_imp.cpp | 2 +- kjsembed/docs/ChangeLog | 2 +- kjsembed/docs/embedding/simple-embed/README | 2 +- kjsembed/docs/examples/imunge/imunge.js | 6 +- kjsembed/jsbuiltin.cpp | 2 +- kjsembed/jsfactory.cpp | 2 +- kjsembed/plugins/Makefile.am | 4 +- kjsembed/plugins/kfileitem_plugin.desktop | 5 - kjsembed/plugins/kfileitemloader.cpp | 223 ------------ kjsembed/plugins/kfileitemloader.h | 69 ---- kjsembed/plugins/tdefileitem_plugin.desktop | 5 + kjsembed/plugins/tdefileitemloader.cpp | 223 ++++++++++++ kjsembed/plugins/tdefileitemloader.h | 69 ++++ kjsembed/tests/test_kconfig.js | 40 --- kjsembed/tests/test_tdeconfig.js | 40 +++ 23 files changed, 1023 insertions(+), 1023 deletions(-) delete mode 100644 kjsembed/bindings/kconfig_imp.cpp delete mode 100644 kjsembed/bindings/kconfig_imp.h create mode 100644 kjsembed/bindings/tdeconfig_imp.cpp create mode 100644 kjsembed/bindings/tdeconfig_imp.h delete mode 100644 kjsembed/plugins/kfileitem_plugin.desktop delete mode 100644 kjsembed/plugins/kfileitemloader.cpp delete mode 100644 kjsembed/plugins/kfileitemloader.h create mode 100644 kjsembed/plugins/tdefileitem_plugin.desktop create mode 100644 kjsembed/plugins/tdefileitemloader.cpp create mode 100644 kjsembed/plugins/tdefileitemloader.h delete mode 100755 kjsembed/tests/test_kconfig.js create mode 100755 kjsembed/tests/test_tdeconfig.js (limited to 'kjsembed') diff --git a/kjsembed/bindings/Makefile.am b/kjsembed/bindings/Makefile.am index cc7cac22..1aa5ce49 100644 --- a/kjsembed/bindings/Makefile.am +++ b/kjsembed/bindings/Makefile.am @@ -9,7 +9,7 @@ libkjsembedbindings_la_SOURCES = image_imp.cpp \ painter_imp.cpp \ pixmap_imp.cpp \ netaccess_imp.cpp \ - kconfig_imp.cpp \ + tdeconfig_imp.cpp \ bindingobject.cpp \ movie_imp.cpp \ sql_imp.cpp \ diff --git a/kjsembed/bindings/bindings.pro b/kjsembed/bindings/bindings.pro index d83d3ba5..6cb7b23d 100644 --- a/kjsembed/bindings/bindings.pro +++ b/kjsembed/bindings/bindings.pro @@ -15,7 +15,7 @@ HEADERS += bindingobject.h \ pen_imp.h \ pixmap_imp.h \ sql_imp.h \ - kconfig_imp.h \ + tdeconfig_imp.h \ point_imp.h \ rect_imp.h \ size_imp.h @@ -29,7 +29,7 @@ SOURCES += bindingobject.cpp \ pen_imp.cpp \ pixmap_imp.cpp \ sql_imp.cpp \ - kconfig_imp.cpp \ + tdeconfig_imp.cpp \ point_imp.cpp \ rect_imp.cpp \ size_imp.cpp diff --git a/kjsembed/bindings/dcop_imp.cpp b/kjsembed/bindings/dcop_imp.cpp index 9dfaf4be..27c4ad22 100644 --- a/kjsembed/bindings/dcop_imp.cpp +++ b/kjsembed/bindings/dcop_imp.cpp @@ -605,7 +605,7 @@ TQString JSDCOPClient::dcopStart( const TQString &appName, const TQStringList& a TQDataStream arg(data, IO_WriteOnly); arg << appName << args; - if ( !kapp->dcopClient()->call( "klauncher", "klauncher", startFunction.latin1(), data, replyType, replyData) ) + if ( !kapp->dcopClient()->call( "tdelauncher", "tdelauncher", startFunction.latin1(), data, replyType, replyData) ) { kdWarning() << "Error: Dcop call failed" << endl; } diff --git a/kjsembed/bindings/kconfig_imp.cpp b/kjsembed/bindings/kconfig_imp.cpp deleted file mode 100644 index 73ca58ed..00000000 --- a/kjsembed/bindings/kconfig_imp.cpp +++ /dev/null @@ -1,536 +0,0 @@ -/* -* Copyright (C) 2003, Ian Reinhart Geiser - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#include "kconfig_imp.h" - -#include - -#ifndef QT_ONLY -#include -#include -#include -#include "kconfig_imp.moc" -#else -#include -#endif -namespace KJSEmbed { -namespace Bindings { - -Config::Config( TQObject *parent, const char *name) - : BindingObject(parent, name) -{ - -#ifndef QT_ONLY - if( name == 0) - m_config = kapp->config(); - else - m_config = new TDEConfig(name); - if( !m_config->checkConfigFilesWritable(true) ) - { - kdWarning( 80001 ) << "Could not write to config file." << endl; - } -#else - m_config = new TQSettings(); - if( name == 0) - m_name = "qjcmd"; - else - m_name = name; - m_config->setPath( "TQJSEmbed",m_name, TQSettings::User ); - m_forceGlobal = false; -#endif -} - -/* -Config::Config( TQObject *parent, const char *name , const TQString& confName) - : BindingObject(parent, name) -{ - TQString fileName = ::locate("kde_config", confName); - m_config = new TDEConfig(fileName); -} -*/ -Config::~Config() -{ -#ifndef QT_ONLY - if( kapp->config() != m_config ) -#endif - delete m_config; -} - -void Config::setDesktopGroup() -{ -#ifndef QT_ONLY - m_config->setDesktopGroup(); -#else - m_config->resetGroup(); - m_config->beginGroup("/Desktop Entry"); -#endif -} - -void Config::setGroup(const TQString& group) -{ -#ifndef QT_ONLY - m_config->setGroup(group); -#else - m_config->resetGroup(); - m_config->beginGroup(group); -#endif -} - -TQString Config::group() -{ - return m_config->group(); -} - -TQStringList Config::groupList() -{ -#ifndef QT_ONLY - return m_config->groupList(); -#else - m_config->resetGroup(); - return m_config->subkeyList(group()); -#endif -} - -TQString Config::locale() -{ -#ifndef QT_ONLY - return m_config->locale(); -#else - return "C"; -#endif -} - -void Config::setForceGlobal( bool force ) -{ -#ifndef QT_ONLY - m_config->setForceGlobal(force); -#else - m_forceGlobal = force; - m_config->setPath( "TQJSEmbed",m_name, (force)?TQSettings::Global:TQSettings::User ); -#endif -} - -bool Config::forceGlobal( ) const -{ -#ifndef QT_ONLY - return m_config->forceGlobal(); -#else - return m_forceGlobal; -#endif -} - -void Config::setDollarExpansion( bool _bExpand ) -{ -#ifndef QT_ONLY - m_config->setDollarExpansion(_bExpand); -#else - Q_UNUSED(_bExpand); -#endif -} - -bool Config::isDollarExpansion() const -{ -#ifndef QT_ONLY - return m_config->isDollarExpansion(); -#else - return false; -#endif -} - -void Config::setReadOnly(bool _ro) -{ -#ifndef QT_ONLY - m_config->setReadOnly(_ro); -#else - Q_UNUSED(_ro); -#endif -} - -bool Config::isReadOnly() const -{ -#ifndef QT_ONLY - return m_config->isReadOnly(); -#else - return false; -#endif -} - -void Config::setReadDefaults(bool b) -{ -#ifndef QT_ONLY - m_config->setReadDefaults(b); -#else - Q_UNUSED(b); -#endif -} - -bool Config::readDefaults() const -{ -#ifndef QT_ONLY - return m_config->readDefaults(); -#else - return false; -#endif -} - -void Config::rollback( bool bDeep ) -{ -#ifndef QT_ONLY - m_config->rollback(bDeep); -#else - Q_UNUSED(bDeep); -#endif -} - -void Config::sync() -{ - m_config->sync(); -} - -bool Config::hasKey( const TQString& key ) const -{ -#ifndef QT_ONLY - return m_config->hasKey(key); -#else - return false; -#endif -} - -bool Config::entryIsImmutable(const TQString &key) const -{ -#ifndef QT_ONLY - return m_config->entryIsImmutable(key); -#else - Q_UNUSED( key ); - return false; -#endif -} - -void Config::revertToDefault(const TQString &key) -{ -#ifndef QT_ONLY - m_config->revertToDefault(key); -#else - Q_UNUSED(key); -#endif -} - -bool Config::hasDefault(const TQString &key) const -{ -#ifndef QT_ONLY - return m_config->hasDefault(key); -#else - Q_UNUSED(key); - return false; -#endif -} - -void Config::setFileWriteMode(int mode) -{ -#ifndef QT_ONLY - m_config->setFileWriteMode(mode); -#else - Q_UNUSED(mode); -#endif -} - -TQString Config::readEntry(const TQString& pKey, const TQString& aDefault ) const -{ - return m_config->readEntry(pKey,aDefault); -} - -TQVariant Config::readPropertyEntry( const TQString& pKey, const TQVariant &pDefault) const -{ -#ifndef QT_ONLY - return m_config->readPropertyEntry(pKey,pDefault); -#else - TQVariant returnVariant; - returnVariant = m_config->readEntry(pKey, pDefault.toString()); - return returnVariant; -#endif -} - -TQStringList Config::readListEntry( const TQString& pKey ) const -{ - return m_config->readListEntry(pKey); -} - -TQString Config::readPathEntry( const TQString& pKey, const TQString & aDefault ) const -{ -#ifndef QT_ONLY - return m_config->readPathEntry(pKey,aDefault); -#else - return readEntry(pKey,aDefault); -#endif -} - -TQStringList Config::readPathListEntry( const TQString& pKey ) const -{ -#ifndef QT_ONLY - return m_config->readPathListEntry(pKey); -#else - return readListEntry(pKey); -#endif - -} - -int Config::readNumEntry( const TQString& pKey, int nDefault) const -{ - return m_config->readNumEntry(pKey,nDefault); -} - -uint Config::readUnsignedNumEntry( const TQString& pKey, uint nDefault) const -{ -#ifndef QT_ONLY - return m_config->readUnsignedNumEntry(pKey,nDefault); -#else - return (uint)readNumEntry(pKey,nDefault); -#endif -} - -long Config::readLongNumEntry( const TQString& pKey, long nDefault) const -{ -#ifndef QT_ONLY - return m_config->readLongNumEntry(pKey,nDefault); -#else - return (long)readNumEntry(pKey,nDefault); -#endif -} - -double Config::readDoubleNumEntry( const TQString& pKey, double nDefault ) const -{ -#ifndef QT_ONLY - return m_config->readDoubleNumEntry(pKey,nDefault); -#else - return m_config->readDoubleEntry(pKey,nDefault); -#endif -} - -TQFont Config::readFontEntry( const TQString& pKey, const TQFont* pDefault ) const -{ -#ifndef QT_ONLY - return m_config->readFontEntry(pKey,pDefault); -#else - return readPropertyEntry(pKey,TQVariant(*pDefault)).toFont(); -#endif -} - -bool Config::readBoolEntry( const TQString& pKey, const bool bDefault ) const -{ - return m_config->readBoolEntry(pKey,bDefault); -} - -TQRect Config::readRectEntry( const TQString& pKey, const TQRect* pDefault ) const -{ -#ifndef QT_ONLY - return m_config->readRectEntry(pKey,pDefault); -#else - return readPropertyEntry(pKey,TQVariant(*pDefault)).toRect(); -#endif -} - -TQPoint Config::readPointEntry( const TQString& pKey, const TQPoint* pDefault ) const -{ -#ifndef QT_ONLY - return m_config->readPointEntry(pKey,pDefault); -#else - return readPropertyEntry(pKey,TQVariant(*pDefault)).toPoint(); -#endif -} - -TQSize Config::readSizeEntry( const TQString& pKey, const TQSize* pDefault ) const -{ -#ifndef QT_ONLY - return m_config->readSizeEntry(pKey,pDefault); -#else - return readPropertyEntry(pKey,TQVariant(*pDefault)).toSize(); -#endif -} - -TQColor Config::readColorEntry( const TQString& pKey, const TQColor* pDefault ) const -{ -#ifndef QT_ONLY - return m_config->readColorEntry(pKey,pDefault); -#else - return readPropertyEntry(pKey,TQVariant(*pDefault)).toColor(); -#endif -} - -TQDateTime Config::readDateTimeEntry( const TQString& pKey, const TQDateTime* pDefault) const -{ -#ifndef QT_ONLY - return m_config->readDateTimeEntry(pKey,pDefault); -#else - return readPropertyEntry(pKey,TQVariant(*pDefault)).toDateTime(); -#endif -} - -TQString Config::readEntryUntranslated( const TQString& pKey, const TQString& aDefault ) const -{ -#ifndef QT_ONLY - return m_config->readEntryUntranslated(pKey,aDefault); -#else - return m_config->readEntry(pKey,aDefault); -#endif -} -void Config::writeEntry( const TQString& pKey, const TQString& pValue ) -{ - m_config->writeEntry(pKey,pValue); -} - -void Config::writePropertyEntry( const TQString& pKey, const TQVariant& pValue ) -{ -#ifndef QT_ONLY - m_config->writeEntry(pKey, pValue ); -#else - m_config->writeEntry(pKey,pValue.toString()); -#endif -} - -void Config::writeListEntry( const TQString& pKey, const TQStringList &rValue ) -{ -#ifndef QT_ONLY - m_config->writeEntry(pKey, rValue ); -#else - m_config->writeEntry(pKey,rValue); -#endif -} - -void Config::writeNumEntry( const TQString& pKey, int nValue ) -{ -#ifndef QT_ONLY - m_config->writeEntry(pKey, nValue ); -#else - m_config->writeEntry(pKey,nValue); -#endif -} -void Config::writeUnsignedNumEntry( const TQString& pKey, uint nValue ) -{ -#ifndef QT_ONLY - m_config->writeEntry(pKey, nValue ); -#else - writeNumEntry(pKey, (int)nValue ); -#endif -} -void Config::writeLongNumEntry( const TQString& pKey, unsigned long nValue ) -{ -#ifndef QT_ONLY - m_config->writeEntry(pKey, nValue ); -#else - writeNumEntry(pKey, (int)nValue); -#endif -} -void Config::writeDoubleNumEntry( const TQString& pKey, double nValue ) -{ - m_config->writeEntry(pKey,nValue); -} -void Config::writeBoolEntry( const TQString& pKey, bool bValue ) -{ - m_config->writeEntry(pKey,bValue); -} -void Config::writeFontEntry( const TQString& pKey, const TQFont& rFont ) -{ -#ifndef QT_ONLY - m_config->writeEntry(pKey, rFont ); -#else - writePropertyEntry(pKey,rFont); -#endif - -} -void Config::writeColorEntry( const TQString& pKey, const TQColor& rColor ) -{ -#ifndef QT_ONLY - m_config->writeEntry(pKey, rColor ); -#else - writePropertyEntry(pKey,rColor); -#endif - -} -void Config::writeDateTimeEntry( const TQString& pKey, const TQDateTime& rDateTime ) -{ -#ifndef QT_ONLY - m_config->writeEntry(pKey, rDateTime ); -#else - writePropertyEntry(pKey,rDateTime); -#endif - -} -void Config::writeRectEntry( const TQString& pKey, const TQRect& rValue ) -{ -#ifndef QT_ONLY - m_config->writeEntry(pKey, rValue ); -#else - writePropertyEntry(pKey,rValue); -#endif - -} -void Config::writePointEntry( const TQString& pKey, const TQPoint& rValue ) -{ -#ifndef QT_ONLY - m_config->writeEntry(pKey, rValue ); -#else - writePropertyEntry(pKey,rValue); -#endif - -} -void Config::writeSizeEntry( const TQString& pKey, const TQSize& rValue ) -{ -#ifndef QT_ONLY - m_config->writeEntry(pKey, rValue ); -#else - writePropertyEntry(pKey,rValue); -#endif -} -void Config::writePathEntry( const TQString& pKey, const TQString & path ) -{ -#ifndef QT_ONLY - m_config->writePathEntry(pKey,path); -#else - writeEntry(pKey,path); -#endif -} -void Config::writePathListEntry( const TQString& pKey, const TQStringList &rValue ) -{ -#ifndef QT_ONLY - m_config->writePathEntry(pKey,rValue); -#else - writeListEntry(pKey,rValue); -#endif -} -void Config::deleteEntry( const TQString& pKey, bool bNLS , bool bGlobal ) -{ -#ifndef QT_ONLY - m_config->deleteEntry(pKey,bNLS,bGlobal); -#else - Q_UNUSED(bNLS); - Q_UNUSED(bGlobal); - m_config->removeEntry(pKey); -#endif -} -bool Config::deleteGroup( const TQString& group, bool bDeep , bool bGlobal ) -{ -#ifndef QT_ONLY - return m_config->deleteGroup(group,bDeep,bGlobal); -#else - return false; -#endif -} - -} -} diff --git a/kjsembed/bindings/kconfig_imp.h b/kjsembed/bindings/kconfig_imp.h deleted file mode 100644 index 75bf3bfd..00000000 --- a/kjsembed/bindings/kconfig_imp.h +++ /dev/null @@ -1,135 +0,0 @@ -// -*- c++ -*- - -/* - * Copyright (C) 2003, Ian Reinhart Geiser - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#ifndef KJSEMBED_CONFIG_IMP_H -#define KJSEMBED_CONFIG_IMP_H - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "bindingobject.h" - -#ifndef QT_ONLY -class TDEConfig; -#else -class TQSettings; -#endif - -namespace KJSEmbed { -namespace Bindings { - -class Config : public BindingObject -{ - Q_OBJECT - TQ_PROPERTY( bool forceGlobal READ forceGlobal WRITE setForceGlobal ) - TQ_PROPERTY( bool dollarExpansion READ isDollarExpansion WRITE setDollarExpansion ) - TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly ) - TQ_PROPERTY( bool readDefaults READ readDefaults WRITE setReadDefaults ) - -public: - Config( TQObject *parent=0, const char *name=0); - /* - Config( TQObject *parent, const char *name, const TQString& confName ); - */ - virtual ~Config(); - - void setForceGlobal( bool force ); - bool forceGlobal() const; - void setDollarExpansion( bool _bExpand ); - bool isDollarExpansion() const; - void setReadOnly(bool _ro); - bool isReadOnly() const; - void setReadDefaults(bool b); - bool readDefaults() const; - -public slots: - - // Group - void setDesktopGroup(); - void setGroup(const TQString&); - TQString group(); - TQStringList groupList(); - TQString locale(); - - void rollback( bool bDeep ); - void sync(); - bool hasKey( const TQString& key ) const; - bool entryIsImmutable(const TQString &key) const; - void revertToDefault(const TQString &key); - bool hasDefault(const TQString &key) const; - - void setFileWriteMode(int mode); - TQString readEntry(const TQString& pKey, const TQString& aDefault ) const; - TQVariant readPropertyEntry( const TQString& pKey, const TQVariant &var) const; - TQStringList readListEntry( const TQString& pKey ) const; - TQString readPathEntry( const TQString& pKey, const TQString & aDefault) const; - TQStringList readPathListEntry( const TQString& pKey ) const; - int readNumEntry( const TQString& pKey, int nDefault ) const; - uint readUnsignedNumEntry( const TQString& pKey, uint nDefault ) const; - long readLongNumEntry( const TQString& pKey, long nDefault ) const; - double readDoubleNumEntry( const TQString& pKey, double nDefault ) const; - TQFont readFontEntry( const TQString& pKey, const TQFont* pDefault) const; - bool readBoolEntry( const TQString& pKey, const bool bDefault ) const; - TQRect readRectEntry( const TQString& pKey, const TQRect* pDefault) const; - TQPoint readPointEntry( const TQString& pKey, const TQPoint* pDefault) const; - TQSize readSizeEntry( const TQString& pKey, const TQSize* pDefault) const; - TQColor readColorEntry( const TQString& pKey, const TQColor* pDefault) const; - TQDateTime readDateTimeEntry( const TQString& pKey, const TQDateTime* pDefault) const; - TQString readEntryUntranslated( const TQString& pKey, const TQString& aDefault ) const; - - void writeEntry( const TQString& pKey, const TQString& pValue ); - void writePropertyEntry( const TQString& pKey, const TQVariant& pValue ); - void writeListEntry( const TQString& pKey, const TQStringList &rValue ); - void writeNumEntry( const TQString& pKey, int nValue ); - void writeUnsignedNumEntry( const TQString& pKey, uint nValue ); - void writeLongNumEntry( const TQString& pKey, unsigned long nValue ); - void writeDoubleNumEntry( const TQString& pKey, double nValue ); - void writeBoolEntry( const TQString& pKey, bool bValue ); - void writeFontEntry( const TQString& pKey, const TQFont& rFont ); - void writeColorEntry( const TQString& pKey, const TQColor& rColor ); - void writeDateTimeEntry( const TQString& pKey, const TQDateTime& rDateTime ); - void writeRectEntry( const TQString& pKey, const TQRect& rValue ); - void writePointEntry( const TQString& pKey, const TQPoint& rValue ); - void writeSizeEntry( const TQString& pKey, const TQSize& rValue ); - void writePathEntry( const TQString& pKey, const TQString & path ); - void writePathListEntry( const TQString& pKey, const TQStringList &rValue); - void deleteEntry( const TQString& pKey, bool bNLS , bool bGlobal ); - bool deleteGroup( const TQString& group, bool bDeep , bool bGlobal ); - -private: -#ifndef QT_ONLY - TDEConfig *m_config; -#else - TQSettings *m_config; - TQString m_name; - bool m_forceGlobal; -#endif -}; -} -} - -#endif diff --git a/kjsembed/bindings/netaccess_imp.cpp b/kjsembed/bindings/netaccess_imp.cpp index 0ffbc12c..91dcf708 100644 --- a/kjsembed/bindings/netaccess_imp.cpp +++ b/kjsembed/bindings/netaccess_imp.cpp @@ -21,7 +21,7 @@ */ #include "netaccess_imp.h" -#include +#include #include #include diff --git a/kjsembed/bindings/tdeconfig_imp.cpp b/kjsembed/bindings/tdeconfig_imp.cpp new file mode 100644 index 00000000..e4fe3211 --- /dev/null +++ b/kjsembed/bindings/tdeconfig_imp.cpp @@ -0,0 +1,536 @@ +/* +* Copyright (C) 2003, Ian Reinhart Geiser + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#include "tdeconfig_imp.h" + +#include + +#ifndef QT_ONLY +#include +#include +#include +#include "tdeconfig_imp.moc" +#else +#include +#endif +namespace KJSEmbed { +namespace Bindings { + +Config::Config( TQObject *parent, const char *name) + : BindingObject(parent, name) +{ + +#ifndef QT_ONLY + if( name == 0) + m_config = kapp->config(); + else + m_config = new TDEConfig(name); + if( !m_config->checkConfigFilesWritable(true) ) + { + kdWarning( 80001 ) << "Could not write to config file." << endl; + } +#else + m_config = new TQSettings(); + if( name == 0) + m_name = "qjcmd"; + else + m_name = name; + m_config->setPath( "TQJSEmbed",m_name, TQSettings::User ); + m_forceGlobal = false; +#endif +} + +/* +Config::Config( TQObject *parent, const char *name , const TQString& confName) + : BindingObject(parent, name) +{ + TQString fileName = ::locate("kde_config", confName); + m_config = new TDEConfig(fileName); +} +*/ +Config::~Config() +{ +#ifndef QT_ONLY + if( kapp->config() != m_config ) +#endif + delete m_config; +} + +void Config::setDesktopGroup() +{ +#ifndef QT_ONLY + m_config->setDesktopGroup(); +#else + m_config->resetGroup(); + m_config->beginGroup("/Desktop Entry"); +#endif +} + +void Config::setGroup(const TQString& group) +{ +#ifndef QT_ONLY + m_config->setGroup(group); +#else + m_config->resetGroup(); + m_config->beginGroup(group); +#endif +} + +TQString Config::group() +{ + return m_config->group(); +} + +TQStringList Config::groupList() +{ +#ifndef QT_ONLY + return m_config->groupList(); +#else + m_config->resetGroup(); + return m_config->subkeyList(group()); +#endif +} + +TQString Config::locale() +{ +#ifndef QT_ONLY + return m_config->locale(); +#else + return "C"; +#endif +} + +void Config::setForceGlobal( bool force ) +{ +#ifndef QT_ONLY + m_config->setForceGlobal(force); +#else + m_forceGlobal = force; + m_config->setPath( "TQJSEmbed",m_name, (force)?TQSettings::Global:TQSettings::User ); +#endif +} + +bool Config::forceGlobal( ) const +{ +#ifndef QT_ONLY + return m_config->forceGlobal(); +#else + return m_forceGlobal; +#endif +} + +void Config::setDollarExpansion( bool _bExpand ) +{ +#ifndef QT_ONLY + m_config->setDollarExpansion(_bExpand); +#else + Q_UNUSED(_bExpand); +#endif +} + +bool Config::isDollarExpansion() const +{ +#ifndef QT_ONLY + return m_config->isDollarExpansion(); +#else + return false; +#endif +} + +void Config::setReadOnly(bool _ro) +{ +#ifndef QT_ONLY + m_config->setReadOnly(_ro); +#else + Q_UNUSED(_ro); +#endif +} + +bool Config::isReadOnly() const +{ +#ifndef QT_ONLY + return m_config->isReadOnly(); +#else + return false; +#endif +} + +void Config::setReadDefaults(bool b) +{ +#ifndef QT_ONLY + m_config->setReadDefaults(b); +#else + Q_UNUSED(b); +#endif +} + +bool Config::readDefaults() const +{ +#ifndef QT_ONLY + return m_config->readDefaults(); +#else + return false; +#endif +} + +void Config::rollback( bool bDeep ) +{ +#ifndef QT_ONLY + m_config->rollback(bDeep); +#else + Q_UNUSED(bDeep); +#endif +} + +void Config::sync() +{ + m_config->sync(); +} + +bool Config::hasKey( const TQString& key ) const +{ +#ifndef QT_ONLY + return m_config->hasKey(key); +#else + return false; +#endif +} + +bool Config::entryIsImmutable(const TQString &key) const +{ +#ifndef QT_ONLY + return m_config->entryIsImmutable(key); +#else + Q_UNUSED( key ); + return false; +#endif +} + +void Config::revertToDefault(const TQString &key) +{ +#ifndef QT_ONLY + m_config->revertToDefault(key); +#else + Q_UNUSED(key); +#endif +} + +bool Config::hasDefault(const TQString &key) const +{ +#ifndef QT_ONLY + return m_config->hasDefault(key); +#else + Q_UNUSED(key); + return false; +#endif +} + +void Config::setFileWriteMode(int mode) +{ +#ifndef QT_ONLY + m_config->setFileWriteMode(mode); +#else + Q_UNUSED(mode); +#endif +} + +TQString Config::readEntry(const TQString& pKey, const TQString& aDefault ) const +{ + return m_config->readEntry(pKey,aDefault); +} + +TQVariant Config::readPropertyEntry( const TQString& pKey, const TQVariant &pDefault) const +{ +#ifndef QT_ONLY + return m_config->readPropertyEntry(pKey,pDefault); +#else + TQVariant returnVariant; + returnVariant = m_config->readEntry(pKey, pDefault.toString()); + return returnVariant; +#endif +} + +TQStringList Config::readListEntry( const TQString& pKey ) const +{ + return m_config->readListEntry(pKey); +} + +TQString Config::readPathEntry( const TQString& pKey, const TQString & aDefault ) const +{ +#ifndef QT_ONLY + return m_config->readPathEntry(pKey,aDefault); +#else + return readEntry(pKey,aDefault); +#endif +} + +TQStringList Config::readPathListEntry( const TQString& pKey ) const +{ +#ifndef QT_ONLY + return m_config->readPathListEntry(pKey); +#else + return readListEntry(pKey); +#endif + +} + +int Config::readNumEntry( const TQString& pKey, int nDefault) const +{ + return m_config->readNumEntry(pKey,nDefault); +} + +uint Config::readUnsignedNumEntry( const TQString& pKey, uint nDefault) const +{ +#ifndef QT_ONLY + return m_config->readUnsignedNumEntry(pKey,nDefault); +#else + return (uint)readNumEntry(pKey,nDefault); +#endif +} + +long Config::readLongNumEntry( const TQString& pKey, long nDefault) const +{ +#ifndef QT_ONLY + return m_config->readLongNumEntry(pKey,nDefault); +#else + return (long)readNumEntry(pKey,nDefault); +#endif +} + +double Config::readDoubleNumEntry( const TQString& pKey, double nDefault ) const +{ +#ifndef QT_ONLY + return m_config->readDoubleNumEntry(pKey,nDefault); +#else + return m_config->readDoubleEntry(pKey,nDefault); +#endif +} + +TQFont Config::readFontEntry( const TQString& pKey, const TQFont* pDefault ) const +{ +#ifndef QT_ONLY + return m_config->readFontEntry(pKey,pDefault); +#else + return readPropertyEntry(pKey,TQVariant(*pDefault)).toFont(); +#endif +} + +bool Config::readBoolEntry( const TQString& pKey, const bool bDefault ) const +{ + return m_config->readBoolEntry(pKey,bDefault); +} + +TQRect Config::readRectEntry( const TQString& pKey, const TQRect* pDefault ) const +{ +#ifndef QT_ONLY + return m_config->readRectEntry(pKey,pDefault); +#else + return readPropertyEntry(pKey,TQVariant(*pDefault)).toRect(); +#endif +} + +TQPoint Config::readPointEntry( const TQString& pKey, const TQPoint* pDefault ) const +{ +#ifndef QT_ONLY + return m_config->readPointEntry(pKey,pDefault); +#else + return readPropertyEntry(pKey,TQVariant(*pDefault)).toPoint(); +#endif +} + +TQSize Config::readSizeEntry( const TQString& pKey, const TQSize* pDefault ) const +{ +#ifndef QT_ONLY + return m_config->readSizeEntry(pKey,pDefault); +#else + return readPropertyEntry(pKey,TQVariant(*pDefault)).toSize(); +#endif +} + +TQColor Config::readColorEntry( const TQString& pKey, const TQColor* pDefault ) const +{ +#ifndef QT_ONLY + return m_config->readColorEntry(pKey,pDefault); +#else + return readPropertyEntry(pKey,TQVariant(*pDefault)).toColor(); +#endif +} + +TQDateTime Config::readDateTimeEntry( const TQString& pKey, const TQDateTime* pDefault) const +{ +#ifndef QT_ONLY + return m_config->readDateTimeEntry(pKey,pDefault); +#else + return readPropertyEntry(pKey,TQVariant(*pDefault)).toDateTime(); +#endif +} + +TQString Config::readEntryUntranslated( const TQString& pKey, const TQString& aDefault ) const +{ +#ifndef QT_ONLY + return m_config->readEntryUntranslated(pKey,aDefault); +#else + return m_config->readEntry(pKey,aDefault); +#endif +} +void Config::writeEntry( const TQString& pKey, const TQString& pValue ) +{ + m_config->writeEntry(pKey,pValue); +} + +void Config::writePropertyEntry( const TQString& pKey, const TQVariant& pValue ) +{ +#ifndef QT_ONLY + m_config->writeEntry(pKey, pValue ); +#else + m_config->writeEntry(pKey,pValue.toString()); +#endif +} + +void Config::writeListEntry( const TQString& pKey, const TQStringList &rValue ) +{ +#ifndef QT_ONLY + m_config->writeEntry(pKey, rValue ); +#else + m_config->writeEntry(pKey,rValue); +#endif +} + +void Config::writeNumEntry( const TQString& pKey, int nValue ) +{ +#ifndef QT_ONLY + m_config->writeEntry(pKey, nValue ); +#else + m_config->writeEntry(pKey,nValue); +#endif +} +void Config::writeUnsignedNumEntry( const TQString& pKey, uint nValue ) +{ +#ifndef QT_ONLY + m_config->writeEntry(pKey, nValue ); +#else + writeNumEntry(pKey, (int)nValue ); +#endif +} +void Config::writeLongNumEntry( const TQString& pKey, unsigned long nValue ) +{ +#ifndef QT_ONLY + m_config->writeEntry(pKey, nValue ); +#else + writeNumEntry(pKey, (int)nValue); +#endif +} +void Config::writeDoubleNumEntry( const TQString& pKey, double nValue ) +{ + m_config->writeEntry(pKey,nValue); +} +void Config::writeBoolEntry( const TQString& pKey, bool bValue ) +{ + m_config->writeEntry(pKey,bValue); +} +void Config::writeFontEntry( const TQString& pKey, const TQFont& rFont ) +{ +#ifndef QT_ONLY + m_config->writeEntry(pKey, rFont ); +#else + writePropertyEntry(pKey,rFont); +#endif + +} +void Config::writeColorEntry( const TQString& pKey, const TQColor& rColor ) +{ +#ifndef QT_ONLY + m_config->writeEntry(pKey, rColor ); +#else + writePropertyEntry(pKey,rColor); +#endif + +} +void Config::writeDateTimeEntry( const TQString& pKey, const TQDateTime& rDateTime ) +{ +#ifndef QT_ONLY + m_config->writeEntry(pKey, rDateTime ); +#else + writePropertyEntry(pKey,rDateTime); +#endif + +} +void Config::writeRectEntry( const TQString& pKey, const TQRect& rValue ) +{ +#ifndef QT_ONLY + m_config->writeEntry(pKey, rValue ); +#else + writePropertyEntry(pKey,rValue); +#endif + +} +void Config::writePointEntry( const TQString& pKey, const TQPoint& rValue ) +{ +#ifndef QT_ONLY + m_config->writeEntry(pKey, rValue ); +#else + writePropertyEntry(pKey,rValue); +#endif + +} +void Config::writeSizeEntry( const TQString& pKey, const TQSize& rValue ) +{ +#ifndef QT_ONLY + m_config->writeEntry(pKey, rValue ); +#else + writePropertyEntry(pKey,rValue); +#endif +} +void Config::writePathEntry( const TQString& pKey, const TQString & path ) +{ +#ifndef QT_ONLY + m_config->writePathEntry(pKey,path); +#else + writeEntry(pKey,path); +#endif +} +void Config::writePathListEntry( const TQString& pKey, const TQStringList &rValue ) +{ +#ifndef QT_ONLY + m_config->writePathEntry(pKey,rValue); +#else + writeListEntry(pKey,rValue); +#endif +} +void Config::deleteEntry( const TQString& pKey, bool bNLS , bool bGlobal ) +{ +#ifndef QT_ONLY + m_config->deleteEntry(pKey,bNLS,bGlobal); +#else + Q_UNUSED(bNLS); + Q_UNUSED(bGlobal); + m_config->removeEntry(pKey); +#endif +} +bool Config::deleteGroup( const TQString& group, bool bDeep , bool bGlobal ) +{ +#ifndef QT_ONLY + return m_config->deleteGroup(group,bDeep,bGlobal); +#else + return false; +#endif +} + +} +} diff --git a/kjsembed/bindings/tdeconfig_imp.h b/kjsembed/bindings/tdeconfig_imp.h new file mode 100644 index 00000000..75bf3bfd --- /dev/null +++ b/kjsembed/bindings/tdeconfig_imp.h @@ -0,0 +1,135 @@ +// -*- c++ -*- + +/* + * Copyright (C) 2003, Ian Reinhart Geiser + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#ifndef KJSEMBED_CONFIG_IMP_H +#define KJSEMBED_CONFIG_IMP_H + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "bindingobject.h" + +#ifndef QT_ONLY +class TDEConfig; +#else +class TQSettings; +#endif + +namespace KJSEmbed { +namespace Bindings { + +class Config : public BindingObject +{ + Q_OBJECT + TQ_PROPERTY( bool forceGlobal READ forceGlobal WRITE setForceGlobal ) + TQ_PROPERTY( bool dollarExpansion READ isDollarExpansion WRITE setDollarExpansion ) + TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly ) + TQ_PROPERTY( bool readDefaults READ readDefaults WRITE setReadDefaults ) + +public: + Config( TQObject *parent=0, const char *name=0); + /* + Config( TQObject *parent, const char *name, const TQString& confName ); + */ + virtual ~Config(); + + void setForceGlobal( bool force ); + bool forceGlobal() const; + void setDollarExpansion( bool _bExpand ); + bool isDollarExpansion() const; + void setReadOnly(bool _ro); + bool isReadOnly() const; + void setReadDefaults(bool b); + bool readDefaults() const; + +public slots: + + // Group + void setDesktopGroup(); + void setGroup(const TQString&); + TQString group(); + TQStringList groupList(); + TQString locale(); + + void rollback( bool bDeep ); + void sync(); + bool hasKey( const TQString& key ) const; + bool entryIsImmutable(const TQString &key) const; + void revertToDefault(const TQString &key); + bool hasDefault(const TQString &key) const; + + void setFileWriteMode(int mode); + TQString readEntry(const TQString& pKey, const TQString& aDefault ) const; + TQVariant readPropertyEntry( const TQString& pKey, const TQVariant &var) const; + TQStringList readListEntry( const TQString& pKey ) const; + TQString readPathEntry( const TQString& pKey, const TQString & aDefault) const; + TQStringList readPathListEntry( const TQString& pKey ) const; + int readNumEntry( const TQString& pKey, int nDefault ) const; + uint readUnsignedNumEntry( const TQString& pKey, uint nDefault ) const; + long readLongNumEntry( const TQString& pKey, long nDefault ) const; + double readDoubleNumEntry( const TQString& pKey, double nDefault ) const; + TQFont readFontEntry( const TQString& pKey, const TQFont* pDefault) const; + bool readBoolEntry( const TQString& pKey, const bool bDefault ) const; + TQRect readRectEntry( const TQString& pKey, const TQRect* pDefault) const; + TQPoint readPointEntry( const TQString& pKey, const TQPoint* pDefault) const; + TQSize readSizeEntry( const TQString& pKey, const TQSize* pDefault) const; + TQColor readColorEntry( const TQString& pKey, const TQColor* pDefault) const; + TQDateTime readDateTimeEntry( const TQString& pKey, const TQDateTime* pDefault) const; + TQString readEntryUntranslated( const TQString& pKey, const TQString& aDefault ) const; + + void writeEntry( const TQString& pKey, const TQString& pValue ); + void writePropertyEntry( const TQString& pKey, const TQVariant& pValue ); + void writeListEntry( const TQString& pKey, const TQStringList &rValue ); + void writeNumEntry( const TQString& pKey, int nValue ); + void writeUnsignedNumEntry( const TQString& pKey, uint nValue ); + void writeLongNumEntry( const TQString& pKey, unsigned long nValue ); + void writeDoubleNumEntry( const TQString& pKey, double nValue ); + void writeBoolEntry( const TQString& pKey, bool bValue ); + void writeFontEntry( const TQString& pKey, const TQFont& rFont ); + void writeColorEntry( const TQString& pKey, const TQColor& rColor ); + void writeDateTimeEntry( const TQString& pKey, const TQDateTime& rDateTime ); + void writeRectEntry( const TQString& pKey, const TQRect& rValue ); + void writePointEntry( const TQString& pKey, const TQPoint& rValue ); + void writeSizeEntry( const TQString& pKey, const TQSize& rValue ); + void writePathEntry( const TQString& pKey, const TQString & path ); + void writePathListEntry( const TQString& pKey, const TQStringList &rValue); + void deleteEntry( const TQString& pKey, bool bNLS , bool bGlobal ); + bool deleteGroup( const TQString& group, bool bDeep , bool bGlobal ); + +private: +#ifndef QT_ONLY + TDEConfig *m_config; +#else + TQSettings *m_config; + TQString m_name; + bool m_forceGlobal; +#endif +}; +} +} + +#endif diff --git a/kjsembed/builtins/stddialog_imp.cpp b/kjsembed/builtins/stddialog_imp.cpp index 24c973b0..56c9919c 100644 --- a/kjsembed/builtins/stddialog_imp.cpp +++ b/kjsembed/builtins/stddialog_imp.cpp @@ -20,7 +20,7 @@ #ifndef QT_ONLY #include -#include +#include #include #else diff --git a/kjsembed/docs/ChangeLog b/kjsembed/docs/ChangeLog index 4b14af71..1fb28d23 100644 --- a/kjsembed/docs/ChangeLog +++ b/kjsembed/docs/ChangeLog @@ -328,7 +328,7 @@ 2004-11-30 Tuesday 17:47 geiseri - test kconfig more robustly. + test tdeconfig more robustly. 2004-11-30 Tuesday 12:02 geiseri diff --git a/kjsembed/docs/embedding/simple-embed/README b/kjsembed/docs/embedding/simple-embed/README index 12f9642b..4d07166c 100644 --- a/kjsembed/docs/embedding/simple-embed/README +++ b/kjsembed/docs/embedding/simple-embed/README @@ -46,7 +46,7 @@ http://developer.kde.org/documentation/tutorials/xmlui/preface.html them more maintainable. For more details, consult : -http://developer.kde.org/documentation/tutorials/kconfigxt/kconfigxt.html +http://developer.kde.org/documentation/tutorials/tdeconfigxt/tdeconfigxt.html * With KParts, you can embed other kde components in your program, or make your program embeddable in other apps. For example, the kmplayer kpart can be called to play videos diff --git a/kjsembed/docs/examples/imunge/imunge.js b/kjsembed/docs/examples/imunge/imunge.js index 6f75cbf1..137cb272 100755 --- a/kjsembed/docs/examples/imunge/imunge.js +++ b/kjsembed/docs/examples/imunge/imunge.js @@ -92,7 +92,7 @@ mw.openFile = function() if ( filename.length > 0 ) { this.load( filename ); openrecent_action.addURL( filename ); - openrecent_action.saveEntries( System.KJSConfig.kconfig(), 'test' ); + openrecent_action.saveEntries( System.KJSConfig.tdeconfig(), 'test' ); System.KJSConfig.sync(); } } @@ -117,7 +117,7 @@ mw.saveFileAs = function() sb.message( filename ); this.imgfile = filename; openrecent_action.addURL( filename ); - openrecent_action.saveEntries( System.KJSConfig.kconfig(), 'test' ); + openrecent_action.saveEntries( System.KJSConfig.tdeconfig(), 'test' ); System.KJSConfig.sync(); } } @@ -154,7 +154,7 @@ mw.setup_actions = function() openrecent_action = StdAction.openRecent( null, '', ac ); openrecent_action.connect( openrecent_action, 'urlSelected(const KURL&)', this, 'load' ); - openrecent_action.loadEntries( System.KJSConfig.kconfig(), 'test' ); + openrecent_action.loadEntries( System.KJSConfig.tdeconfig(), 'test' ); save_action = StdAction.save( null, '', ac ); save_action.connect( save_action, 'activated()', this, 'saveFile' ); diff --git a/kjsembed/jsbuiltin.cpp b/kjsembed/jsbuiltin.cpp index 04680116..50e16f40 100644 --- a/kjsembed/jsbuiltin.cpp +++ b/kjsembed/jsbuiltin.cpp @@ -28,7 +28,7 @@ #include "builtins/resources.h" #endif // QT_ONLY -#include "bindings/kconfig_imp.h" +#include "bindings/tdeconfig_imp.h" #include "jsfactory_imp.h" #include "jsbuiltinproxy.h" diff --git a/kjsembed/jsfactory.cpp b/kjsembed/jsfactory.cpp index d5be63a9..f8c36d75 100644 --- a/kjsembed/jsfactory.cpp +++ b/kjsembed/jsfactory.cpp @@ -113,7 +113,7 @@ #include "bindings/painter_imp.h" #include "bindings/movie_imp.h" #include "bindings/sql_imp.h" -#include "bindings/kconfig_imp.h" +#include "bindings/tdeconfig_imp.h" #include "bindings/brush_imp.h" #include "bindings/size_imp.h" #include "bindings/rect_imp.h" diff --git a/kjsembed/plugins/Makefile.am b/kjsembed/plugins/Makefile.am index 5468d792..3f1e4fab 100644 --- a/kjsembed/plugins/Makefile.am +++ b/kjsembed/plugins/Makefile.am @@ -26,12 +26,12 @@ libqprocessplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) libqprocessplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_KFILE) ../libkjsembed.la # the Plugin's source, library search path, and link libraries -libfileitemplugin_la_SOURCES = kfileitemloader.cpp +libfileitemplugin_la_SOURCES = tdefileitemloader.cpp libfileitemplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(all_libraries) libfileitemplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) ../libkjsembed.la # this is where the desktop file will go plugindesktopdir = $(kde_servicesdir) -plugindesktop_DATA = imagefx_plugin.desktop qprocess_plugin.desktop kfileitem_plugin.desktop +plugindesktop_DATA = imagefx_plugin.desktop qprocess_plugin.desktop tdefileitem_plugin.desktop noinst_DATA = customobject_plugin.desktop customqobject_plugin.desktop diff --git a/kjsembed/plugins/kfileitem_plugin.desktop b/kjsembed/plugins/kfileitem_plugin.desktop deleted file mode 100644 index f5f91552..00000000 --- a/kjsembed/plugins/kfileitem_plugin.desktop +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Name=KFileItem -ServiceTypes=JSBindingPlugin/Binding -Type=Service -X-TDE-Library=libfileitemplugin diff --git a/kjsembed/plugins/kfileitemloader.cpp b/kjsembed/plugins/kfileitemloader.cpp deleted file mode 100644 index e3fcdb7f..00000000 --- a/kjsembed/plugins/kfileitemloader.cpp +++ /dev/null @@ -1,223 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2004 by ian reinhart geiser * - * geiseri@kde.org * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ -#include "kfileitemloader.h" - -#include -#include -#include -#include -#include - -#include -#include - -namespace KJSEmbed { -namespace Bindings { - -KFileItemLoader::KFileItemLoader(TQObject *parent, const char *name, const TQStringList &args) - : JSBindingPlugin(parent, name, args) -{ -} - - -KFileItemLoader::~KFileItemLoader() -{ -} - -KJS::Object KFileItemLoader::createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const -{ - kdDebug() << "Loading a KFileItem object" << endl; - JSOpaqueProxy *prx = new JSOpaqueProxy( (void *) 0, "KFileItem" ); - - KJS::Object proxyObj(prx); - KFileItemImp::addBindings( exec, proxyObj ); - return proxyObj; -} - -} // Bindings -} // KJSEmbed - -KJSEmbed::Bindings::KFileItemImp::KFileItemImp( KJS::ExecState * exec, int id ) -: JSProxyImp(exec), mid(id) -{ - -} - -KJSEmbed::Bindings::KFileItemImp::~ KFileItemImp( ) -{ - -} - -void KJSEmbed::Bindings::KFileItemImp::addBindings( KJS::ExecState * exec, KJS::Object & object ) -{ - - JSOpaqueProxy *op = JSProxy::toOpaqueProxy( object.imp() ); - if ( !op ) - { - kdWarning() << "KFileItemImp::addBindings() failed, not a JSOpaqueProxy" << endl; - return; - } - - if ( op->typeName() != "KFileItem" ) - { - kdWarning() << "KFileItemImp::addBindings() failed, type is " << op->typeName() << - endl; - return; - } - - JSProxy::MethodTable methods[] = { - { Methodrefresh, "refresh"}, - { MethodrefreshMimeType, "refreshMimeType"}, - { Methodurl, "url"}, - { MethodsetUrl, "setUrl"}, - { MethodsetName, "setName"}, - { MethodpermissionsString, "permissionsString"}, - { Methoduser, "user"}, - { Methodgroup, "group"}, - { MethodisLink, "isLink"}, - { MethodisDir, "isDir"}, - { MethodisFile, "isFile"}, - { MethodisReadable, "isReadable"}, - { MethodlinkDest, "linkDest"}, - { MethodtimeString, "timeString"}, - { MethodisLocalFile, "isLocalFile"}, - { Methodtext, "text"}, - { Methodname, "name"}, - { MethodmimeType, "mimeType"}, - { MethodisMimeTypeKnown, "isMimeTypeKnown"}, - { MethodmimeComment, "mimeComment"}, - { MethodiconName, "iconName"}, - { Methodpixmap, "pixmap"}, - { Methodoverlays, "overlays"}, - { MethodgetStatusBarInfo, "getStatusBarInfo"}, - { MethodgetToolTipText, "getToolTipText"}, - { Methodrun, "run"}, - { 0, 0 } - }; - - int idx = 0; - do { - KFileItemImp *meth = new KFileItemImp( exec, methods[idx].id ); - object.put( exec , methods[idx].name, KJS::Object(meth) ); - ++idx; - } while( methods[idx].id ); - -} - -KJS::Value KJSEmbed::Bindings::KFileItemImp::call( KJS::ExecState * exec, KJS::Object & self, const KJS::List & args ) -{ - kdDebug() << "KFileItemImp::call() " << mid << endl; - JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); - if ( !op ) { - kdWarning() << "KFileItemImp::call() failed, not a JSOpaqueProxy" << endl; - return KJS::Value(); - } - - if ( op->typeName() != "KFileItem" ) { - kdWarning() << "KFileItemImp::call() failed, type is " << op->typeName() << endl; - return KJS::Value(); - } - - KFileItem *obj = op->toNative(); - - KJS::Value retValue = KJS::Value(); - switch ( mid ) { - case Methodrefresh: - obj->refresh(); - break; - case MethodrefreshMimeType: - obj->refreshMimeType(); - break; - case Methodurl: - { - TQString url = obj->url().url(); - retValue = KJS::String(url); - break; - } - case MethodsetUrl: - { - TQString url = extractTQString(exec, args, 0); - obj->setURL(url); - break; - } - case MethodsetName: - case MethodpermissionsString: - case Methoduser: - case Methodgroup: - case MethodisLink: - case MethodisDir: - case MethodisFile: - case MethodisReadable: - case MethodlinkDest: - case MethodtimeString: - case MethodisLocalFile: - case Methodtext: - { - retValue = convertToValue(exec, obj->text() ); - break; - } - case Methodname: - case MethodmimeType: - case MethodisMimeTypeKnown: - case MethodmimeComment: - case MethodiconName: - { - retValue = convertToValue( exec, obj->iconName() ); - break; - } - case Methodpixmap: - { - int size = extractInt(exec, args, 0); - int state = extractInt(exec, args, 1); - retValue = convertToValue(exec, obj->pixmap(size, state)); - break; - } - case Methodoverlays: - { - retValue = convertToValue(exec, obj->overlays()); - break; - } - case MethodgetStatusBarInfo: - { - retValue = KJS::String( obj->getStatusBarInfo() ); - break; - } - case MethodgetToolTipText: - { - int maxcount = extractInt(exec, args, 0); - retValue = KJS::String(obj->getToolTipText(maxcount)); - break; - } - case Methodrun: - obj->run(); - break; - default: - kdWarning() << "KFileItemImp has no method " << mid << endl; - break; - } - - op->setValue((void*) obj, "KFileItem"); - return retValue; - -} - -#include -typedef KGenericFactory KFileItemLoaderFactory; -K_EXPORT_COMPONENT_FACTORY( libfileitemplugin, KFileItemLoaderFactory( "KFileItemLoader" ) ) diff --git a/kjsembed/plugins/kfileitemloader.h b/kjsembed/plugins/kfileitemloader.h deleted file mode 100644 index 384379f3..00000000 --- a/kjsembed/plugins/kfileitemloader.h +++ /dev/null @@ -1,69 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2004 by ian reinhart geiser * - * geiseri@kde.org * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ -#ifndef KFILEITEMLOADER_H -#define KFILEITEMLOADER_H - -#include -#include - -/** -Loader for the KFileItem wrapper. This is automaticly invoked from the jsfactory. - -@author ian reinhart geiser -*/ -namespace KJSEmbed { -namespace Bindings { - -class KFileItemLoader : public JSBindingPlugin -{ -public: - KFileItemLoader(TQObject *parent, const char *name, const TQStringList &args); - - ~KFileItemLoader(); - - KJS::Object createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const; -}; - -class KFileItemImp : public JSProxyImp -{ - /** Identifiers for the methods provided by this class. */ - enum MethodId { Methodrefresh, MethodrefreshMimeType, Methodurl, MethodsetUrl, MethodsetName, MethodpermissionsString, Methoduser, Methodgroup, MethodisLink, MethodisDir, MethodisFile, MethodisReadable, MethodlinkDest, MethodtimeString, MethodisLocalFile, Methodtext, Methodname, MethodmimeType, MethodisMimeTypeKnown, MethodmimeComment, MethodiconName, Methodpixmap, Methodoverlays, MethodgetStatusBarInfo, MethodgetToolTipText, Methodrun}; -public: - KFileItemImp( KJS::ExecState *exec, int id ); - virtual ~KFileItemImp(); - - static void addBindings( KJS::ExecState *exec, KJS::Object &object ); - - /** Returns true iff this object implements the call function. */ - virtual bool implementsCall() const - { - return true; - } - - /** Invokes the call function. */ - virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); -private: - int mid; -}; - -} // Bindings -} // KJSEmbed - -#endif diff --git a/kjsembed/plugins/tdefileitem_plugin.desktop b/kjsembed/plugins/tdefileitem_plugin.desktop new file mode 100644 index 00000000..f5f91552 --- /dev/null +++ b/kjsembed/plugins/tdefileitem_plugin.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Name=KFileItem +ServiceTypes=JSBindingPlugin/Binding +Type=Service +X-TDE-Library=libfileitemplugin diff --git a/kjsembed/plugins/tdefileitemloader.cpp b/kjsembed/plugins/tdefileitemloader.cpp new file mode 100644 index 00000000..6ab7cc45 --- /dev/null +++ b/kjsembed/plugins/tdefileitemloader.cpp @@ -0,0 +1,223 @@ +/*************************************************************************** + * Copyright (C) 2004 by ian reinhart geiser * + * geiseri@kde.org * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ +#include "tdefileitemloader.h" + +#include +#include +#include +#include +#include + +#include +#include + +namespace KJSEmbed { +namespace Bindings { + +KFileItemLoader::KFileItemLoader(TQObject *parent, const char *name, const TQStringList &args) + : JSBindingPlugin(parent, name, args) +{ +} + + +KFileItemLoader::~KFileItemLoader() +{ +} + +KJS::Object KFileItemLoader::createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const +{ + kdDebug() << "Loading a KFileItem object" << endl; + JSOpaqueProxy *prx = new JSOpaqueProxy( (void *) 0, "KFileItem" ); + + KJS::Object proxyObj(prx); + KFileItemImp::addBindings( exec, proxyObj ); + return proxyObj; +} + +} // Bindings +} // KJSEmbed + +KJSEmbed::Bindings::KFileItemImp::KFileItemImp( KJS::ExecState * exec, int id ) +: JSProxyImp(exec), mid(id) +{ + +} + +KJSEmbed::Bindings::KFileItemImp::~ KFileItemImp( ) +{ + +} + +void KJSEmbed::Bindings::KFileItemImp::addBindings( KJS::ExecState * exec, KJS::Object & object ) +{ + + JSOpaqueProxy *op = JSProxy::toOpaqueProxy( object.imp() ); + if ( !op ) + { + kdWarning() << "KFileItemImp::addBindings() failed, not a JSOpaqueProxy" << endl; + return; + } + + if ( op->typeName() != "KFileItem" ) + { + kdWarning() << "KFileItemImp::addBindings() failed, type is " << op->typeName() << + endl; + return; + } + + JSProxy::MethodTable methods[] = { + { Methodrefresh, "refresh"}, + { MethodrefreshMimeType, "refreshMimeType"}, + { Methodurl, "url"}, + { MethodsetUrl, "setUrl"}, + { MethodsetName, "setName"}, + { MethodpermissionsString, "permissionsString"}, + { Methoduser, "user"}, + { Methodgroup, "group"}, + { MethodisLink, "isLink"}, + { MethodisDir, "isDir"}, + { MethodisFile, "isFile"}, + { MethodisReadable, "isReadable"}, + { MethodlinkDest, "linkDest"}, + { MethodtimeString, "timeString"}, + { MethodisLocalFile, "isLocalFile"}, + { Methodtext, "text"}, + { Methodname, "name"}, + { MethodmimeType, "mimeType"}, + { MethodisMimeTypeKnown, "isMimeTypeKnown"}, + { MethodmimeComment, "mimeComment"}, + { MethodiconName, "iconName"}, + { Methodpixmap, "pixmap"}, + { Methodoverlays, "overlays"}, + { MethodgetStatusBarInfo, "getStatusBarInfo"}, + { MethodgetToolTipText, "getToolTipText"}, + { Methodrun, "run"}, + { 0, 0 } + }; + + int idx = 0; + do { + KFileItemImp *meth = new KFileItemImp( exec, methods[idx].id ); + object.put( exec , methods[idx].name, KJS::Object(meth) ); + ++idx; + } while( methods[idx].id ); + +} + +KJS::Value KJSEmbed::Bindings::KFileItemImp::call( KJS::ExecState * exec, KJS::Object & self, const KJS::List & args ) +{ + kdDebug() << "KFileItemImp::call() " << mid << endl; + JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); + if ( !op ) { + kdWarning() << "KFileItemImp::call() failed, not a JSOpaqueProxy" << endl; + return KJS::Value(); + } + + if ( op->typeName() != "KFileItem" ) { + kdWarning() << "KFileItemImp::call() failed, type is " << op->typeName() << endl; + return KJS::Value(); + } + + KFileItem *obj = op->toNative(); + + KJS::Value retValue = KJS::Value(); + switch ( mid ) { + case Methodrefresh: + obj->refresh(); + break; + case MethodrefreshMimeType: + obj->refreshMimeType(); + break; + case Methodurl: + { + TQString url = obj->url().url(); + retValue = KJS::String(url); + break; + } + case MethodsetUrl: + { + TQString url = extractTQString(exec, args, 0); + obj->setURL(url); + break; + } + case MethodsetName: + case MethodpermissionsString: + case Methoduser: + case Methodgroup: + case MethodisLink: + case MethodisDir: + case MethodisFile: + case MethodisReadable: + case MethodlinkDest: + case MethodtimeString: + case MethodisLocalFile: + case Methodtext: + { + retValue = convertToValue(exec, obj->text() ); + break; + } + case Methodname: + case MethodmimeType: + case MethodisMimeTypeKnown: + case MethodmimeComment: + case MethodiconName: + { + retValue = convertToValue( exec, obj->iconName() ); + break; + } + case Methodpixmap: + { + int size = extractInt(exec, args, 0); + int state = extractInt(exec, args, 1); + retValue = convertToValue(exec, obj->pixmap(size, state)); + break; + } + case Methodoverlays: + { + retValue = convertToValue(exec, obj->overlays()); + break; + } + case MethodgetStatusBarInfo: + { + retValue = KJS::String( obj->getStatusBarInfo() ); + break; + } + case MethodgetToolTipText: + { + int maxcount = extractInt(exec, args, 0); + retValue = KJS::String(obj->getToolTipText(maxcount)); + break; + } + case Methodrun: + obj->run(); + break; + default: + kdWarning() << "KFileItemImp has no method " << mid << endl; + break; + } + + op->setValue((void*) obj, "KFileItem"); + return retValue; + +} + +#include +typedef KGenericFactory KFileItemLoaderFactory; +K_EXPORT_COMPONENT_FACTORY( libfileitemplugin, KFileItemLoaderFactory( "KFileItemLoader" ) ) diff --git a/kjsembed/plugins/tdefileitemloader.h b/kjsembed/plugins/tdefileitemloader.h new file mode 100644 index 00000000..384379f3 --- /dev/null +++ b/kjsembed/plugins/tdefileitemloader.h @@ -0,0 +1,69 @@ +/*************************************************************************** + * Copyright (C) 2004 by ian reinhart geiser * + * geiseri@kde.org * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ +#ifndef KFILEITEMLOADER_H +#define KFILEITEMLOADER_H + +#include +#include + +/** +Loader for the KFileItem wrapper. This is automaticly invoked from the jsfactory. + +@author ian reinhart geiser +*/ +namespace KJSEmbed { +namespace Bindings { + +class KFileItemLoader : public JSBindingPlugin +{ +public: + KFileItemLoader(TQObject *parent, const char *name, const TQStringList &args); + + ~KFileItemLoader(); + + KJS::Object createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const; +}; + +class KFileItemImp : public JSProxyImp +{ + /** Identifiers for the methods provided by this class. */ + enum MethodId { Methodrefresh, MethodrefreshMimeType, Methodurl, MethodsetUrl, MethodsetName, MethodpermissionsString, Methoduser, Methodgroup, MethodisLink, MethodisDir, MethodisFile, MethodisReadable, MethodlinkDest, MethodtimeString, MethodisLocalFile, Methodtext, Methodname, MethodmimeType, MethodisMimeTypeKnown, MethodmimeComment, MethodiconName, Methodpixmap, Methodoverlays, MethodgetStatusBarInfo, MethodgetToolTipText, Methodrun}; +public: + KFileItemImp( KJS::ExecState *exec, int id ); + virtual ~KFileItemImp(); + + static void addBindings( KJS::ExecState *exec, KJS::Object &object ); + + /** Returns true iff this object implements the call function. */ + virtual bool implementsCall() const + { + return true; + } + + /** Invokes the call function. */ + virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); +private: + int mid; +}; + +} // Bindings +} // KJSEmbed + +#endif diff --git a/kjsembed/tests/test_kconfig.js b/kjsembed/tests/test_kconfig.js deleted file mode 100755 index 519f13fb..00000000 --- a/kjsembed/tests/test_kconfig.js +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env kjscmd - -var confName = "jsconfigrc"; -var groupName = "Blah"; - -var conf = new Config(this, confName); - -var grp = conf.group(); - -println( "Group=" + grp ); - -conf.setGroup(groupName); -conf.writeColorEntry("Test Color", "blue"); -conf.writeListEntry("Test Array", ["A Value","B Value", "C Value"]); -conf.writeEntry("Test Text", "this is a test"); -conf.sync(); - -var newData = conf.readListEntry("Test Array"); -var newColor = conf.readColorEntry("Test Color"); -var newText = conf.readEntry("Test Text"); -println("Reread Active Config"); -println("Groups: " + conf.groupList()); -println(newData); -println(newColor); -println(newText); - - -var newConf = new Config(this, confName); -println("Reread Saved Config"); -println("Groups: " + newConf.groupList()); -newConf.setGroup(groupName); - -newData = newConf.readListEntry("Test Array"); -newColor = newConf.readColorEntry("Test Color", "red"); -newText = newConf.readEntry("Test Text", "Wrong Text"); - -println(newData); -println(newColor); -println(newText); - diff --git a/kjsembed/tests/test_tdeconfig.js b/kjsembed/tests/test_tdeconfig.js new file mode 100755 index 00000000..519f13fb --- /dev/null +++ b/kjsembed/tests/test_tdeconfig.js @@ -0,0 +1,40 @@ +#!/usr/bin/env kjscmd + +var confName = "jsconfigrc"; +var groupName = "Blah"; + +var conf = new Config(this, confName); + +var grp = conf.group(); + +println( "Group=" + grp ); + +conf.setGroup(groupName); +conf.writeColorEntry("Test Color", "blue"); +conf.writeListEntry("Test Array", ["A Value","B Value", "C Value"]); +conf.writeEntry("Test Text", "this is a test"); +conf.sync(); + +var newData = conf.readListEntry("Test Array"); +var newColor = conf.readColorEntry("Test Color"); +var newText = conf.readEntry("Test Text"); +println("Reread Active Config"); +println("Groups: " + conf.groupList()); +println(newData); +println(newColor); +println(newText); + + +var newConf = new Config(this, confName); +println("Reread Saved Config"); +println("Groups: " + newConf.groupList()); +newConf.setGroup(groupName); + +newData = newConf.readListEntry("Test Array"); +newColor = newConf.readColorEntry("Test Color", "red"); +newText = newConf.readEntry("Test Text", "Wrong Text"); + +println(newData); +println(newColor); +println(newText); + -- cgit v1.2.3