Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 files changed, 736 insertions, 0 deletions

diff --git a/kabc/plugins/dir/Makefile.am b/kabc/plugins/dir/Makefile.am
new file mode 100644
index 000000000..bf07e6af3
--- /dev/null
+++ b/kabc/plugins/dir/Makefile.am
@@ -0,0 +1,28 @@
+INCLUDES = -I$(top_builddir)/kabc -I$(top_srcdir)/kabc -I$(top_builddir) $(all_includes)
+
+# these are the headers for your project
+noinst_HEADERS = resourcedirconfig.h
+
+lib_LTLIBRARIES = libkabc_dir.la
+libkabc_dir_la_SOURCES = resourcedir.cpp resourcedirconfig.cpp
+libkabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined 
+libkabc_dir_la_LIBADD = $(LIB_KABC)
+libkabc_dir_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+
+kde_module_LTLIBRARIES = kabc_dir.la
+kabc_dir_la_SOURCES = resourcedirplugin.cpp
+kabc_dir_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
+kabc_dir_la_LIBADD = libkabc_dir.la
+
+METASOURCES = AUTO
+
+messages: rc.cpp
+	$(XGETTEXT) *.cpp -o $(podir)/kabc_dir.pot
+
+kabcincludedir = $(includedir)/kabc
+kabcinclude_HEADERS = resourcedir.h
+
+servicedir = $(kde_servicesdir)/kresources/kabc
+service_DATA = dir.desktop
+
+resourcedirplugin.lo: ../../addressee.h
diff --git a/kabc/plugins/dir/dir.desktop b/kabc/plugins/dir/dir.desktop
new file mode 100644
index 000000000..faffd99d4
--- /dev/null
+++ b/kabc/plugins/dir/dir.desktop
@@ -0,0 +1,92 @@
+[Desktop Entry]
+Name=Directory
+Name[af]=Gids
+Name[ar]=دليل
+Name[az]=Cərgə
+Name[be]=Тэчка
+Name[bn]=ডিরেক্টরি
+Name[br]=Renkell
+Name[bs]=Direktorij
+Name[ca]=Directori
+Name[cs]=Adresář
+Name[csb]=Katalog
+Name[cy]=Cyfeiriadur
+Name[da]=Mappe
+Name[de]=Verzeichnis
+Name[el]=Κατάλογος
+Name[eo]=Dosierujo
+Name[es]=Directorio
+Name[et]=Kataloog
+Name[eu]=Direktorioa
+Name[fa]=فهرست راهنما
+Name[fi]=Hakemisto
+Name[fo]=Fíluskrá
+Name[fr]=Dossier
+Name[fy]=Map
+Name[ga]=Comhadlann
+Name[gl]=Directório
+Name[he]=ספריה
+Name[hi]=डिरेक्ट्री
+Name[hr]=Mapa
+Name[hsb]=Zapisk
+Name[hu]=Könyvtár
+Name[id]=Direktori
+Name[is]=Mappa
+Name[it]=Cartella
+Name[ja]=ディレクトリ
+Name[ka]=დასტა
+Name[kk]=Каталог
+Name[km]=ថត
+Name[ko]=자료방
+Name[ku]=Peldank
+Name[lb]=Verzeechnis
+Name[lt]=Aplankas
+Name[lv]=Direktorija
+Name[mk]=Именик
+Name[mn]=Лавлах
+Name[ms]=Direktori
+Name[mt]=Direttorju
+Name[nb]=Katalog
+Name[nds]=Orner
+Name[ne]=डाइरेक्टरी
+Name[nl]=Map
+Name[nn]=Katalog
+Name[nso]=Tshupetso
+Name[oc]=Directori
+Name[pa]=ਡਾਇਰੈਕਟਰੀ
+Name[pl]=Katalog
+Name[pt]=Directoria
+Name[pt_BR]=Diretório
+Name[ro]=Director
+Name[ru]=Каталог
+Name[rw]=ububiko
+Name[se]=Ohcu
+Name[sk]=Priečinok
+Name[sl]=Imenik
+Name[sq]=Fioka
+Name[sr]=Фасцикла
+Name[sr@Latn]=Fascikla
+Name[ss]=I-directory
+Name[sv]=Katalog
+Name[ta]=அடைவு
+Name[te]=డైరక్టరి
+Name[tg]=Феҳраст
+Name[th]=ไดเรกทอรี
+Name[tr]=Dizin
+Name[tt]=Törgäk
+Name[uk]=Каталог
+Name[uz]=Jild
+Name[uz@cyrillic]=Жилд
+Name[ven]=Tsumbavhulwo
+Name[vi]=Thư mục
+Name[wa]=Ridant
+Name[xh]=Ulawulo
+Name[zh_CN]=目录
+Name[zh_HK]=目錄
+Name[zh_TW]=目錄
+Name[zu]=Uhlu lwamafayela
+X-KDE-Library=kabc_dir
+Type=Service
+ServiceTypes=KResources/Plugin
+X-KDE-ResourceFamily=contact
+X-KDE-ResourceType=dir
diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp
new file mode 100644
index 000000000..1947e98f3
--- /dev/null
+++ b/kabc/plugins/dir/resourcedir.cpp
@@ -0,0 +1,310 @@
+/*
+    This file is part of libkabc.
+    Copyright (c) 2002 - 2003 Tobias Koenig <tokoe@kde.org>
+
+    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 <errno.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <qregexp.h>
+#include <qtimer.h>
+#include <qwidget.h>
+
+#include <kapplication.h>
+#include <kconfig.h>
+#include <kdebug.h>
+#include <kgenericfactory.h>
+#include <kglobal.h>
+#include <klocale.h>
+#include <kstandarddirs.h>
+#include <kurlrequester.h>
+
+#include "addressbook.h"
+#include "formatfactory.h"
+#include "resourcedirconfig.h"
+#include "stdaddressbook.h"
+#include "lock.h"
+
+#include "resourcedir.h"
+
+using namespace KABC;
+
+extern "C"
+{
+  void *init_kabc_dir()
+  {
+    return new KRES::PluginFactory<ResourceDir,ResourceDirConfig>();
+  }
+}
+
+
+ResourceDir::ResourceDir( const KConfig *config )
+  : Resource( config ), mAsynchronous( false )
+{
+  if ( config ) {
+    init( config->readPathEntry( "FilePath", StdAddressBook::directoryName() ),
+          config->readEntry( "FileFormat", "vcard" ) );
+  } else {
+    init( StdAddressBook::directoryName(), "vcard" );
+  }
+}
+
+ResourceDir::ResourceDir( const QString &path, const QString &format )
+  : Resource( 0 ), mAsynchronous( false )
+{
+  init( path, format );
+}
+
+void ResourceDir::init( const QString &path, const QString &format )
+{
+  mFormatName = format;
+
+  FormatFactory *factory = FormatFactory::self();
+  mFormat = factory->format( mFormatName );
+
+  if ( !mFormat ) {
+    mFormatName = "vcard";
+    mFormat = factory->format( mFormatName );
+  }
+
+  mLock = 0;
+
+  connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( pathChanged() ) );
+  connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( pathChanged() ) );
+  connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( pathChanged() ) );
+
+  setPath( path );
+}
+
+ResourceDir::~ResourceDir()
+{
+  delete mFormat;
+  mFormat = 0;
+}
+
+void ResourceDir::writeConfig( KConfig *config )
+{
+  Resource::writeConfig( config );
+
+  if ( mPath == StdAddressBook::directoryName() )
+    config->deleteEntry( "FilePath" );
+  else
+    config->writePathEntry( "FilePath", mPath );
+
+  config->writeEntry( "FileFormat", mFormatName );
+}
+
+Ticket *ResourceDir::requestSaveTicket()
+{
+  kdDebug(5700) << "ResourceDir::requestSaveTicket()" << endl;
+
+  if ( !addressBook() ) return 0;
+
+  delete mLock;
+  mLock = new Lock( mPath );
+
+  if ( mLock->lock() ) {
+    addressBook()->emitAddressBookLocked();
+  } else {
+    addressBook()->error( mLock->error() );
+    kdDebug(5700) << "ResourceFile::requestSaveTicket(): Unable to lock path '"
+                  << mPath << "': " << mLock->error() << endl;
+    return 0;
+  }
+
+  return createTicket( this );
+}
+
+void ResourceDir::releaseSaveTicket( Ticket *ticket )
+{
+  delete ticket;
+  
+  delete mLock;
+  mLock = 0;
+}
+
+bool ResourceDir::doOpen()
+{
+  QDir dir( mPath );
+  if ( !dir.exists() ) { // no directory available
+    return dir.mkdir( dir.path() );
+  } else {
+    QString testName = dir.entryList( QDir::Files )[0];
+    if ( testName.isNull() || testName.isEmpty() ) // no file in directory
+      return true;
+
+    QFile file( mPath + "/" + testName );
+    if ( file.open( IO_ReadOnly ) )
+      return true;
+
+    if ( file.size() == 0 )
+      return true;
+
+    bool ok = mFormat->checkFormat( &file );
+    file.close();
+    return ok;
+  }
+}
+
+void ResourceDir::doClose()
+{
+}
+
+bool ResourceDir::load()
+{
+  kdDebug(5700) << "ResourceDir::load(): '" << mPath << "'" << endl;
+
+  mAsynchronous = false;
+
+  QDir dir( mPath );
+  QStringList files = dir.entryList( QDir::Files );
+
+  QStringList::Iterator it;
+  bool ok = true;
+  for ( it = files.begin(); it != files.end(); ++it ) {
+    QFile file( mPath + "/" + (*it) );
+
+    if ( !file.open( IO_ReadOnly ) ) {
+      addressBook()->error( i18n( "Unable to open file '%1' for reading" ).arg( file.name() ) );
+      ok = false;
+      continue;
+    }
+
+    if ( !mFormat->loadAll( addressBook(), this, &file ) )
+      ok = false;
+
+    file.close();
+  }
+
+  return ok;
+}
+
+bool ResourceDir::asyncLoad()
+{
+  mAsynchronous = true;
+
+  bool ok = load();
+  if ( !ok )
+    emit loadingError( this, i18n( "Loading resource '%1' failed!" )
+                       .arg( resourceName() ) );
+  else
+    emit loadingFinished( this );
+
+  return ok;
+}
+
+bool ResourceDir::save( Ticket * )
+{
+  kdDebug(5700) << "ResourceDir::save(): '" << mPath << "'" << endl;
+
+  Addressee::Map::Iterator it;
+  bool ok = true;
+
+  mDirWatch.stopScan();
+
+  for ( it = mAddrMap.begin(); it != mAddrMap.end(); ++it ) {
+    if ( !it.data().changed() )
+      continue;
+
+    QFile file( mPath + "/" + (*it).uid() );
+    if ( !file.open( IO_WriteOnly ) ) {
+      addressBook()->error( i18n( "Unable to open file '%1' for writing" ).arg( file.name() ) );
+      continue;
+    }
+
+    mFormat->save( *it, &file );
+
+    // mark as unchanged
+    (*it).setChanged( false );
+
+    file.close();
+  }
+
+  mDirWatch.startScan();
+
+  return ok;
+}
+
+bool ResourceDir::asyncSave( Ticket *ticket )
+{
+  bool ok = save( ticket );
+  if ( !ok )
+    emit savingError( this, i18n( "Saving resource '%1' failed!" )
+                      .arg( resourceName() ) );
+  else
+    emit savingFinished( this );
+
+  return ok;
+}
+
+void ResourceDir::setPath( const QString &path )
+{
+  mDirWatch.stopScan();
+  if ( mDirWatch.contains( mPath ) )
+    mDirWatch.removeDir( mPath );
+
+  mPath = path;
+  mDirWatch.addDir( mPath, true );
+  mDirWatch.startScan();
+}
+
+QString ResourceDir::path() const
+{
+  return mPath;
+}
+
+void ResourceDir::setFormat( const QString &format )
+{
+  mFormatName = format;
+
+  if ( mFormat )
+    delete mFormat;
+
+  FormatFactory *factory = FormatFactory::self();
+  mFormat = factory->format( mFormatName );
+}
+
+QString ResourceDir::format() const
+{
+  return mFormatName;
+}
+
+void ResourceDir::pathChanged()
+{
+  if ( !addressBook() )
+    return;
+
+  clear();
+  if ( mAsynchronous )
+    asyncLoad();
+  else {
+    load();
+    addressBook()->emitAddressBookChanged();
+  }
+}
+
+void ResourceDir::removeAddressee( const Addressee& addr )
+{
+  QFile::remove( mPath + "/" + addr.uid() );
+  mAddrMap.erase( addr.uid() );
+}
+
+#include "resourcedir.moc"
diff --git a/kabc/plugins/dir/resourcedir.h b/kabc/plugins/dir/resourcedir.h
new file mode 100644
index 000000000..b54f0ddda
--- /dev/null
+++ b/kabc/plugins/dir/resourcedir.h
@@ -0,0 +1,113 @@
+/*
+    This file is part of libkabc.
+    Copyright (c) 2002 - 2003 Tobias Koenig <tokoe@kde.org>
+
+    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 KABC_RESOURCEDIR_H
+#define KABC_RESOURCEDIR_H
+
+#include <kconfig.h>
+#include <kdirwatch.h>
+
+#include <sys/types.h>
+
+#include <kabc/resource.h>
+
+class QTimer;
+
+namespace KABC {
+
+class FormatPlugin;
+class Lock;
+
+/**
+  @internal
+*/
+class KABC_EXPORT ResourceDir : public Resource
+{
+  Q_OBJECT
+
+  public:
+    ResourceDir( const KConfig* );
+    ResourceDir( const QString &path, const QString &type = "vcard" );
+    ~ResourceDir();
+
+    virtual void writeConfig( KConfig* );
+
+    virtual bool doOpen();
+    virtual void doClose();
+  
+    virtual Ticket *requestSaveTicket();
+    virtual void releaseSaveTicket( Ticket* );
+
+    virtual bool load();
+    virtual bool asyncLoad();
+    virtual bool save( Ticket* ticket );
+    virtual bool asyncSave( Ticket* ticket );
+
+    /**
+      Set path to be used for saving.
+     */
+    void setPath( const QString & );
+
+    /**
+      Return path used for loading and saving the address book.
+     */
+    QString path() const;
+
+    /**
+      Set the format by name.
+     */
+    void setFormat( const QString &format );
+
+    /**
+      Returns the format name.
+     */
+    QString format() const;
+  
+    /**
+      Remove a addressee from its source.
+      This method is mainly called by KABC::AddressBook.
+     */
+    virtual void removeAddressee( const Addressee& addr );
+
+  protected slots:
+    void pathChanged();
+
+  protected:
+    void init( const QString &path, const QString &format );
+
+  private:
+    FormatPlugin *mFormat;
+
+    KDirWatch mDirWatch;
+
+    QString mPath;
+    QString mFormatName;
+
+    Lock *mLock;
+
+    bool mAsynchronous;
+
+    class ResourceDirPrivate;
+    ResourceDirPrivate *d;
+};
+
+}
+
+#endif
diff --git a/kabc/plugins/dir/resourcedirconfig.cpp b/kabc/plugins/dir/resourcedirconfig.cpp
new file mode 100644
index 000000000..ada7c1f9d
--- /dev/null
+++ b/kabc/plugins/dir/resourcedirconfig.cpp
@@ -0,0 +1,107 @@
+/*
+    This file is part of libkabc.
+    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
+
+    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 <qlabel.h>
+#include <qlayout.h>
+
+#include <kdebug.h>
+#include <klocale.h>
+#include <kstandarddirs.h>
+#include <kdialog.h>
+
+#include "formatfactory.h"
+#include "resourcedir.h"
+#include "stdaddressbook.h"
+
+#include "resourcedirconfig.h"
+
+using namespace KABC;
+
+ResourceDirConfig::ResourceDirConfig( QWidget* parent,  const char* name )
+    : KRES::ConfigWidget( parent, name )
+{
+  QGridLayout *mainLayout = new QGridLayout( this, 2, 2, 0, 
+      KDialog::spacingHint() );
+
+  QLabel *label = new QLabel( i18n( "Format:" ), this );
+  mFormatBox = new KComboBox( this );
+
+  mainLayout->addWidget( label, 0, 0 );
+  mainLayout->addWidget( mFormatBox, 0, 1 );
+
+  label = new QLabel( i18n( "Location:" ), this );
+  mFileNameEdit = new KURLRequester( this );
+  mFileNameEdit->setMode( KFile::Directory );
+
+  mainLayout->addWidget( label, 1, 0 );
+  mainLayout->addWidget( mFileNameEdit, 1, 1 );
+
+  FormatFactory *factory = FormatFactory::self();
+  QStringList formats = factory->formats();
+  QStringList::Iterator it;
+  for ( it = formats.begin(); it != formats.end(); ++it ) {
+    FormatInfo *info = factory->info( *it );
+    if ( info ) {
+      mFormatTypes << (*it);
+      mFormatBox->insertItem( info->nameLabel );
+    }
+  }
+
+  mInEditMode = false;
+}
+
+void ResourceDirConfig::setEditMode( bool value )
+{
+  mFormatBox->setEnabled( !value );
+  mInEditMode = value;
+}
+
+void ResourceDirConfig::loadSettings( KRES::Resource *res )
+{
+  ResourceDir *resource = dynamic_cast<ResourceDir*>( res );
+  
+  if ( !resource ) {
+    kdDebug(5700) << "ResourceDirConfig::loadSettings(): cast failed" << endl;
+    return;
+  }
+
+  mFormatBox->setCurrentItem( mFormatTypes.findIndex( resource->format() ) );
+
+  mFileNameEdit->setURL( resource->path() );
+  if ( mFileNameEdit->url().isEmpty() )
+    mFileNameEdit->setURL( KABC::StdAddressBook::directoryName() );
+}
+
+void ResourceDirConfig::saveSettings( KRES::Resource *res )
+{
+  ResourceDir *resource = dynamic_cast<ResourceDir*>( res );
+  
+  if ( !resource ) {
+    kdDebug(5700) << "ResourceDirConfig::loadSettings(): cast failed" << endl;
+    return;
+  }
+
+  if ( mInEditMode )
+    resource->setFormat( mFormatTypes[ mFormatBox->currentItem() ] );
+
+  resource->setPath( mFileNameEdit->url() );
+}
+
+#include "resourcedirconfig.moc"
diff --git a/kabc/plugins/dir/resourcedirconfig.h b/kabc/plugins/dir/resourcedirconfig.h
new file mode 100644
index 000000000..46d446b36
--- /dev/null
+++ b/kabc/plugins/dir/resourcedirconfig.h
@@ -0,0 +1,54 @@
+/*
+    This file is part of libkabc.
+    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
+
+    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 RESOURCEDIRCONFIG_H
+#define RESOURCEDIRCONFIG_H
+
+#include <kcombobox.h>
+#include <kurlrequester.h>
+
+#include <kresources/configwidget.h>
+
+namespace KABC {
+
+class KABC_EXPORT ResourceDirConfig : public KRES::ConfigWidget
+{ 
+  Q_OBJECT
+
+public:
+  ResourceDirConfig( QWidget* parent = 0, const char* name = 0 );
+
+  void setEditMode( bool value );
+
+public slots:
+  void loadSettings( KRES::Resource* );
+  void saveSettings( KRES::Resource* );
+
+private:
+  KComboBox* mFormatBox;
+  KURLRequester* mFileNameEdit;
+
+  QStringList mFormatTypes;
+
+  bool mInEditMode;
+};
+
+}
+#endif
diff --git a/kabc/plugins/dir/resourcedirplugin.cpp b/kabc/plugins/dir/resourcedirplugin.cpp
new file mode 100644
index 000000000..a2bd6d138
--- /dev/null
+++ b/kabc/plugins/dir/resourcedirplugin.cpp
@@ -0,0 +1,32 @@
+/*
+    This file is part of libkabc.
+    Copyright (c) 2002 - 2003 Tobias Koenig <tokoe@kde.org>
+
+    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 "resourcedir.h"
+#include "resourcedirconfig.h"
+
+using namespace KABC;
+
+extern "C"
+{
+  KDE_EXPORT void *init_kabc_dir()
+  {
+    return new KRES::PluginFactory<ResourceDir, ResourceDirConfig>();
+  }
+}