PluginLoader.cc 55.8 KB
Newer Older
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
/*===========================================================================*\
 *                                                                           *
 *                              OpenFlipper                                  *
 *      Copyright (C) 2001-2009 by Computer Graphics Group, RWTH Aachen      *
 *                           www.openflipper.org                             *
 *                                                                           *
 *---------------------------------------------------------------------------*
 *  This file is part of OpenFlipper.                                        *
 *                                                                           *
 *  OpenFlipper is free software: you can redistribute it and/or modify      *
 *  it under the terms of the GNU Lesser General Public License as           *
 *  published by the Free Software Foundation, either version 3 of           *
 *  the License, or (at your option) any later version with the              *
 *  following exceptions:                                                    *
 *                                                                           *
 *  If other files instantiate templates or use macros                       *
 *  or inline functions from this file, or you compile this file and         *
 *  link it with other files to produce an executable, this file does        *
 *  not by itself cause the resulting executable to be covered by the        *
 *  GNU Lesser General Public License. This exception does not however       *
 *  invalidate any other reasons why the executable file might be            *
 *  covered by the GNU Lesser General Public License.                        *
 *                                                                           *
 *  OpenFlipper 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 Lesser General Public License for more details.                      *
 *                                                                           *
 *  You should have received a copy of the GNU LesserGeneral Public          *
 *  License along with OpenFlipper. If not,                                  *
 *  see <http://www.gnu.org/licenses/>.                                      *
 *                                                                           *
\*===========================================================================*/

/*===========================================================================*\
 *                                                                           *
37
38
 *   $Revision$                                                       *
 *   $Author$                                                       *
39
40
41
 *   $Date$                   *
 *                                                                           *
\*===========================================================================*/
Jan Möbius's avatar
 
Jan Möbius committed
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61




//=============================================================================
//
//  CLASS Core - IMPLEMENTATION of the Plugin Loading
//
//=============================================================================


//== INCLUDES =================================================================

// -------------------- mview
#include "Core.hh"

#include <QMenuBar>
#include <QToolBox>
#include <QMessageBox>
#include <QApplication>
Jan Möbius's avatar
Jan Möbius committed
62
#include <QScrollArea>
Jan Möbius's avatar
 
Jan Möbius committed
63
64
65
66
67
68
69
70
71

#include <QPluginLoader>
#include "OpenFlipper/BasePlugin/BaseInterface.hh"
#include "OpenFlipper/BasePlugin/KeyInterface.hh"
#include "OpenFlipper/BasePlugin/BackupInterface.hh"
#include "OpenFlipper/BasePlugin/LoggingInterface.hh"
#include "OpenFlipper/BasePlugin/MouseInterface.hh"
#include "OpenFlipper/BasePlugin/PickingInterface.hh"
#include "OpenFlipper/BasePlugin/ToolboxInterface.hh"
Dirk Wilden's avatar
Dirk Wilden committed
72
#include "OpenFlipper/BasePlugin/OptionsInterface.hh"
Jan Möbius's avatar
 
Jan Möbius committed
73
74
75
76
#include "OpenFlipper/BasePlugin/ToolbarInterface.hh"
#include "OpenFlipper/BasePlugin/TextureInterface.hh"
#include "OpenFlipper/BasePlugin/MenuInterface.hh"
#include "OpenFlipper/BasePlugin/ContextMenuInterface.hh"
77
#include "OpenFlipper/BasePlugin/ProcessInterface.hh"
Jan Möbius's avatar
 
Jan Möbius committed
78
#include "OpenFlipper/BasePlugin/ViewInterface.hh"
Jan Möbius's avatar
Jan Möbius committed
79
#include "OpenFlipper/BasePlugin/ViewModeInterface.hh"
Jan Möbius's avatar
 
Jan Möbius committed
80
81
82
83
84
85
#include "OpenFlipper/BasePlugin/LoadSaveInterface.hh"
#include "OpenFlipper/BasePlugin/StatusbarInterface.hh"
#include "OpenFlipper/BasePlugin/INIInterface.hh"
#include "OpenFlipper/BasePlugin/FileInterface.hh"
#include "OpenFlipper/BasePlugin/RPCInterface.hh"
#include "OpenFlipper/BasePlugin/ScriptInterface.hh"
86
#include "OpenFlipper/BasePlugin/SecurityInterface.hh"
87
#include "OpenFlipper/BasePlugin/TypeInterface.hh"
Jan Möbius's avatar
 
Jan Möbius committed
88
89
90
91
92
93
94
95
96

#include "OpenFlipper/INIFile/INIFile.hh"

#include "OpenFlipper/common/GlobalOptions.hh"

#include <QMessageBox>
#include <QtScript/QScriptValueIterator>

#include <ACG/QtWidgets/QtFileDialog.hh>
Dirk Wilden's avatar
Dirk Wilden committed
97
#include "OpenFlipper/widgets/PluginDialog/PluginDialog.hh"
Jan Möbius's avatar
 
Jan Möbius committed
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117

//== IMPLEMENTATION ==========================================================


bool Core::checkSlot(QObject* _plugin , const char* _slotSignature) {
  const QMetaObject* meta = _plugin->metaObject();
  int id = meta->indexOfSlot( QMetaObject::normalizedSignature( _slotSignature ) );
  return ( id != -1 );
}

bool Core::checkSignal(QObject* _plugin , const char* _signalSignature) {
  const QMetaObject* meta = _plugin->metaObject();
  int id = meta->indexOfSignal( QMetaObject::normalizedSignature( _signalSignature ) );
  return ( id != -1 );
}

 /** Load plugins from dir Plugins. The plugin information gets stored, toolbox and menu entries are created and the required signals and slots are connected.
  */
void Core::loadPlugins()
{
Dirk Wilden's avatar
Dirk Wilden committed
118
  //try to load plugins from new location
119
  QDir tempDir = QDir(OpenFlipper::Options::pluginDir());
Dirk Wilden's avatar
Dirk Wilden committed
120

121
122
123
124
125
  // Possible Plugin extensions
  QStringList filter;
  if ( OpenFlipper::Options::isWindows() )
    filter << "*.dll";
  else if ( OpenFlipper::Options::isDarwin() )
Jan Möbius's avatar
Jan Möbius committed
126
127
    filter << "*.so";
//    filter << "*.dylib";
128
129
130
  else
    filter << "*.so";
  
Jan Möbius's avatar
 
Jan Möbius committed
131
  // Get all files in the Plugin dir
132
  QStringList pluginlist = tempDir.entryList(filter,QDir::Files);
Dirk Wilden's avatar
Dirk Wilden committed
133

134
135
  // Convert local file path to absolute path
  for (int i=0; i < pluginlist.size(); i++) {
136
     pluginlist[i] = tempDir.absoluteFilePath(pluginlist[i]);
Jan Möbius's avatar
 
Jan Möbius committed
137
138
  }

139
140
141
142
143
144
145
146
147
148
149
  // get all Plugin Names which will not be loaded
  QStringList dontLoadPlugins = OpenFlipperSettings().value("PluginControl/DontLoadNames").toStringList();
  
  // Output info about additional plugins
  for ( int i = 0 ; i < dontLoadPlugins.size(); ++i) 
    emit log(LOGOUT,tr("dontLoadPlugins Plugin from ini file: %1").arg( dontLoadPlugins[i] ) );
  
  // get all Plugins which should be loaded in addition to the standard plugins 
  QStringList additionalPlugins = OpenFlipperSettings().value("PluginControl/AdditionalPlugins").toStringList();
  
  // Output info about additional plugins
Jan Möbius's avatar
Jan Möbius committed
150
  for ( int i = 0 ; i < additionalPlugins.size(); ++i) {
151
    emit log(LOGOUT,tr("Additional Plugin from file: %1").arg( additionalPlugins[i] ) );
Jan Möbius's avatar
Jan Möbius committed
152
  }
153
154
155
156
  
  // Prepend the additional Plugins to the plugin list
  pluginlist = additionalPlugins << pluginlist;
  
Jan Möbius's avatar
 
Jan Möbius committed
157
  // Sort plugins to load FilePlugins first
158
  QStringList typePlugins;
Jan Möbius's avatar
 
Jan Möbius committed
159
160
161
162
163
  QStringList filePlugins;
  QStringList textureControl;
  QStringList otherPlugins;
  //plugin Liste sortieren
  for (int i=0; i < pluginlist.size(); i++)
164
165
166
    if (pluginlist[i].contains("Plugin-Type") )
      typePlugins.push_back(pluginlist[i]);
    else if (pluginlist[i].contains("Plugin-File") )
Jan Möbius's avatar
 
Jan Möbius committed
167
168
169
170
171
172
      filePlugins.push_back(pluginlist[i]);
    else if (pluginlist[i].contains("TextureControl"))
      textureControl.push_back(pluginlist[i]);
    else
      otherPlugins.push_back(pluginlist[i]);

173
174
175
176
177
178
  // This is the order in which plugins have to be loaded:
  // First load all type Plugins to register the dataTypes to the core
  // Than load the file plugins to load objects 
  // Next is textureControl to control texture based properties
  // Than load everything else.
  pluginlist = typePlugins << filePlugins << textureControl << otherPlugins;
Jan Möbius's avatar
 
Jan Möbius committed
179

180
181
  for ( int i = 0 ; i < dontLoadPlugins.size(); ++i )
    emit log(LOGWARN,tr("Skipping Plugins :\t %1").arg( dontLoadPlugins[i] ) );
Jan Möbius's avatar
 
Jan Möbius committed
182

183
  emit log(LOGOUT,"================================================================================");
Jan Möbius's avatar
 
Jan Möbius committed
184
185
186
187

  // Try to load each file as a plugin
  for ( int i = 0 ; i < pluginlist.size() ; ++i) {

188
    if ( OpenFlipper::Options::gui() && OpenFlipperSettings().value("Core/Gui/splash",true).toBool() ) {
Jan Möbius's avatar
Jan Möbius committed
189
      splashMessage_ = tr("Loading Plugin %1/%2").arg(i).arg(pluginlist.size()) ;
Jan Möbius's avatar
 
Jan Möbius committed
190
191
192
193
      splash_->showMessage( splashMessage_ , Qt::AlignBottom | Qt::AlignLeft , Qt::white);
      QApplication::processEvents();
    }

Dirk Wilden's avatar
Dirk Wilden committed
194
    loadPlugin(pluginlist[i],true);
Jan Möbius's avatar
 
Jan Möbius committed
195
196
197
198
199
200
  }

  splashMessage_ = "";

  emit pluginsInitialized();

Jan Möbius's avatar
Jan Möbius committed
201
  emit log(LOGOUT,tr("Loaded %n Plugin(s)","",plugins.size()) );
Jan Möbius's avatar
 
Jan Möbius committed
202
203
204
205
206
207
208
209
210
}

/** @brief slot for loading Plugins
 */
void Core::slotLoadPlugin(){

  if ( OpenFlipper::Options::nogui() )
    return;

211
  // Setup filters for possible plugin extensions
Jan Möbius's avatar
 
Jan Möbius committed
212
213
214
  QString filter;
  if ( OpenFlipper::Options::isWindows() )
    filter = "Plugins (*.dll)";
215
  else if ( OpenFlipper::Options::isDarwin() )
Jan Möbius's avatar
Jan Möbius committed
216
217
    // filter = "Plugins (*.dylib)";
    filter = "Plugins (*.so)";
Jan Möbius's avatar
 
Jan Möbius committed
218
219
220
  else
    filter = "Plugins (*.so)";

221
  // Ask the user to select the file to load
222
  QString filename = ACG::getOpenFileName(coreWidget_,tr("Load Plugin"),filter, OpenFlipperSettings().value("Core/CurrentDir").toString() );
Jan Möbius's avatar
 
Jan Möbius committed
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243

  if (filename.isEmpty())
    return;

  // get the plugin name
  // and check if Plugin is in the dontLoad List
  QPluginLoader loader( filename );
  QObject *plugin = loader.instance();
  QString name;

  // Check if a plugin has been loaded
  if (plugin) {
    // Check if it is a BasePlugin
    BaseInterface* basePlugin = qobject_cast< BaseInterface * >(plugin);
    if ( basePlugin ) {
      name = basePlugin->name();
    }else
      return;
  }else
    return;

244
245
  // Ask if the plugin is on the block list
  QStringList dontLoadPlugins = OpenFlipperSettings().value("PluginControl/DontLoadNames").toStringList();
246
  if (dontLoadPlugins.contains(name)){
Jan Möbius's avatar
 
Jan Möbius committed
247
248
      int ret = QMessageBox::question(0, tr("Plugin Loading Prevention"),
                   tr("OpenFlipper is currently configured to prevent loading this plugin.\n"
249
                      "Do you want to enable this plugin permanently?"),
Jan Möbius's avatar
 
Jan Möbius committed
250
251
                   QMessageBox::Yes | QMessageBox::No,
                   QMessageBox::Yes);
252
253
254
255
256
      if (ret == QMessageBox::Yes) {
        dontLoadPlugins.removeAll(name);
        OpenFlipperSettings().setValue("PluginControl/DontLoadNames",dontLoadPlugins);
      } else
         return;
Jan Möbius's avatar
 
Jan Möbius committed
257
  }
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
  
  // check if the plugin is not on the additional plugin list
  QStringList additionalPlugins = OpenFlipperSettings().value("PluginControl/AdditionalPlugins").toStringList();
  if (!additionalPlugins.contains(name)){
    int ret = QMessageBox::question(0, tr("Plugin Loading ..."),
                                       tr("Should OpenFlipper load this plugin on next startup?"),
                                    QMessageBox::Yes | QMessageBox::No,
                                    QMessageBox::Yes);
    if (ret == QMessageBox::Yes) {
      additionalPlugins << filename;
      std::cerr << "Added: " << filename.toStdString() << std::endl;
      OpenFlipperSettings().setValue("PluginControl/AdditionalPlugins",additionalPlugins);
    }
  }
  
Jan Möbius's avatar
 
Jan Möbius committed
273
274
275
  loadPlugin(filename,false);
}

Dirk Wilden's avatar
Dirk Wilden committed
276
/** @brief slot for showing loaded Plugins
Jan Möbius's avatar
 
Jan Möbius committed
277
 */
Dirk Wilden's avatar
Dirk Wilden committed
278
void Core::slotShowPlugins(){
Jan Möbius's avatar
 
Jan Möbius committed
279

Dirk Wilden's avatar
Dirk Wilden committed
280
281
282
283
284
285
286
  if ( OpenFlipper::Options::gui() ){

    int ret = 0;

    while (ret == 0){

      PluginDialog* dialog = new PluginDialog(plugins, coreWidget_);
Jan Möbius's avatar
 
Jan Möbius committed
287

Dirk Wilden's avatar
Dirk Wilden committed
288
289
290
291
292
293
294
295
296
297
      //connect signals
      connect(dialog, SIGNAL(unloadPlugin(QString)), this, SLOT(unloadPlugin(QString)));
      connect(dialog, SIGNAL( loadPlugin() ), this, SLOT( slotLoadPlugin() ));

      //if a plugin was deleted/loaded the dialog returns 0 and it needs to be loaded again
      ret = dialog->exec();

      delete dialog;
    }
  }
Jan Möbius's avatar
 
Jan Möbius committed
298
299
300
301
302
303
304
}

/** @brief Unload a Plugin with given name (slot)
 *  @param name plugin name
 */
void Core::unloadPlugin(QString name){
  for (uint i=0; i < plugins.size(); i++)
Dirk Wilden's avatar
Dirk Wilden committed
305
    if (plugins[i].rpcName == name){
Jan Möbius's avatar
 
Jan Möbius committed
306
307
308
309
310
311
      if ( checkSlot( plugins[i].plugin , "exit()" ) )
        QMetaObject::invokeMethod(plugins[i].plugin, "exit",  Qt::DirectConnection);

      //remove toolbox widget
      QString name_nospace = name;
      name_nospace.remove(" ");
Jan Möbius's avatar
Jan Möbius committed
312
313
      if ( coreWidget_->viewModes_[0]->visibleToolboxes.contains(name_nospace) )
        coreWidget_->viewModes_[0]->visibleToolboxes.removeAt(coreWidget_->viewModes_[0]->visibleToolboxes.indexOf(name_nospace));
314
315
316
317
      for ( uint j = 0 ; j < plugins[i].toolboxWidgets.size() ; ++j )
        if (plugins[i].toolboxWidgets[j].second ){
          plugins[i].toolboxWidgets[j].second->setVisible(false);
          delete plugins[i].toolboxWidgets[j].second;
318
        }
Jan Möbius's avatar
 
Jan Möbius committed
319
320
321

      plugins.erase(plugins.begin() + i);

Jan Möbius's avatar
Jan Möbius committed
322
      emit log(LOGOUT,tr("Unloaded Plugin :\t\t %1").arg( name) );
Jan Möbius's avatar
 
Jan Möbius committed
323
324
325
326

      return;
    }

Jan Möbius's avatar
Jan Möbius committed
327
    log(LOGERR, tr("Unable to unload plugin '%1' (plugin wasn't found)").arg(name));
Jan Möbius's avatar
 
Jan Möbius committed
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
}

/** @brief Load a Plugin with given filename
 *  @param filename complete path + filename of the plugin
 *  @param silent if 'true': user isn't asked what to do if a plugin is already loaded
 */
void Core::loadPlugin(QString filename, bool silent){

  // Only load .dll under windows
  if ( OpenFlipper::Options::isWindows() ) {
    QString dllname = filename;
    if ( ! dllname.endsWith( ".dll" ) )
      return;
  }

  // Only load .so under linux
  if ( OpenFlipper::Options::isLinux() ) {
    QString soname = filename;
    if ( ! soname.endsWith( ".so" ) )
      return;
  }

  // Try to open the file
  QPluginLoader loader( filename );
  QObject *plugin = loader.instance();

  // Check if a plugin has been loaded
  if (plugin) {
Dirk Wilden's avatar
Dirk Wilden committed
356
    PluginInfo info;
Jan Möbius's avatar
 
Jan Möbius committed
357
358
    QString supported;

Dirk Wilden's avatar
Dirk Wilden committed
359
360
    emit log(LOGOUT,tr("Location : \t %2").arg(filename) );
    
Jan Möbius's avatar
 
Jan Möbius committed
361
362
363
    // Check if it is a BasePlugin
    BaseInterface* basePlugin = qobject_cast< BaseInterface * >(plugin);
    if ( basePlugin ) {
364
365
      emit log(LOGOUT,tr("Found Plugin : \t %1").arg(basePlugin->name()) );
      emit log(LOGOUT,tr("Location : \t %2").arg(filename) );
Jan Möbius's avatar
 
Jan Möbius committed
366

367
      if ( OpenFlipper::Options::gui() && OpenFlipperSettings().value("Core/Gui/splash",true).toBool() ) {
Jan Möbius's avatar
 
Jan Möbius committed
368
369
370
371
372
373
        splashMessage_ = splashMessage_ + " " + basePlugin->name() ;
        splash_->showMessage( splashMessage_ , Qt::AlignBottom | Qt::AlignLeft , Qt::white);
        QApplication::processEvents();
      }

      //Check if plugin is already loaded
Dirk Wilden's avatar
Dirk Wilden committed
374
375
376
377
378
      for (uint k=0; k < plugins.size(); k++){

          QString name_nospace =  basePlugin->name();
          name_nospace.remove(" ");

379
380
          if (plugins[k].name == name_nospace){
            if (silent || OpenFlipper::Options::nogui() ){ //dont load the plugin
Jan Möbius's avatar
Jan Möbius committed
381
              emit log(LOGWARN, tr("\t\t\t Already loaded from %1").arg( plugins[k].path) );
382
              emit log(LOGOUT,"================================================================================");
383
              return;
Jan Möbius's avatar
 
Jan Möbius committed
384
385
386
          }else{ //ask the user
            int ret = QMessageBox::question(coreWidget_,
                                            tr("Plugin already loaded"),
Jan Möbius's avatar
Jan Möbius committed
387
                                            tr("A Plugin with the same name was already loaded from %1.\n" 
388
                                               "You can only load the new plugin if you unload the existing one first.\n\n"
Jan Möbius's avatar
Jan Möbius committed
389
                                               "Do you want to unload the existing plugin first?").arg( plugins[k].path),
Jan Möbius's avatar
 
Jan Möbius committed
390
391
392
393
                                            QMessageBox::Yes|QMessageBox::No, QMessageBox::No);
            if (ret == QMessageBox::Yes)
              unloadPlugin(plugins[k].name);
            else{
Jan Möbius's avatar
Jan Möbius committed
394
              emit log(LOGWARN, tr("\t\t\t Already loaded from %1.").arg( plugins[k].path));
395
              emit log(LOGOUT,"================================================================================");
Jan Möbius's avatar
 
Jan Möbius committed
396
397
398
399
              return;
            }
          }
        }
Dirk Wilden's avatar
Dirk Wilden committed
400
      }
Jan Möbius's avatar
 
Jan Möbius committed
401

402
403
404
      QStringList dontLoadPlugins = OpenFlipperSettings().value("PluginControl/DontLoadNames").toStringList();
      
      if ( dontLoadPlugins.contains(basePlugin->name(), Qt::CaseInsensitive) ) {
Jan Möbius's avatar
Jan Möbius committed
405
        emit log(LOGWARN,tr("OpenFlipper.ini prevented Plugin %1 from being loaded! ").arg( basePlugin->name() ));
406
        emit log(LOGOUT,"================================================================================");
Jan Möbius's avatar
 
Jan Möbius committed
407
408
409
        return;
      }

410
411
412
      //Check if it is a BasePlugin
      SecurityInterface * securePlugin = qobject_cast< SecurityInterface * >(plugin);
      if ( securePlugin ) {
413
        emit log(LOGINFO,tr("Plugin uses security interface. Trying to authenticate against plugin ..."));
414
415
416
417
418

        bool success = false;
        QMetaObject::invokeMethod(plugin,"authenticate", Q_RETURN_ARG( bool , success ) ) ;

        if ( success )
419
          emit log(LOGINFO,tr("... ok. Loading plugin "));
420
        else {
421
          emit log(LOGERR,tr("... failed. Plugin access denied."));
422
          emit log(LOGOUT,"================================================================================");
423
424
425
          return;
        }
      }
426
427


Jan Möbius's avatar
Jan Möbius committed
428
      emit log(LOGOUT,tr("Plugin Desciption :\t %1 ").arg( basePlugin->description()) );
Jan Möbius's avatar
 
Jan Möbius committed
429
430
431
432
433
434
435
436

      supported = "BaseInterface ";

      info.name          = basePlugin->name();
      info.description   = basePlugin->description();
      info.plugin        = plugin;
      info.path          = filename;

437
438
439
440
441
      if ( checkSlot(plugin,"version()") )
        info.version = basePlugin->version();
      else
        info.version = QString::number(-1);

Jan Möbius's avatar
 
Jan Möbius committed
442
443
444
      if ( OpenFlipper::Options::nogui() ) {

        if ( ! checkSlot( plugin , "noguiSupported()" ) ) {
445
          emit log(LOGWARN,tr("Running in nogui mode which is unsupported by this plugin, skipping") );
446
          emit log(LOGOUT,"================================================================================");
Jan Möbius's avatar
 
Jan Möbius committed
447
448
449
450
451
452
          return;
        }

      }


453
454
      // Check for baseInterface of old style!
      if ( checkSignal(plugin,"updated_objects(int)") ) {
455
        log(LOGERR,tr("Plugin Uses old style updated_objects! Convert to updatedObject!"));
456
        emit log(LOGOUT,"================================================================================");
457
458
459
460
        return;
      }

      if ( checkSignal(plugin,"update_view()") ) {
461
        log(LOGERR,tr("Plugin Uses old style update_view! Convert to updateView!"));
462
        emit log(LOGOUT,"================================================================================");
463
464
465
466
467
468
        return;
      }

      if ( checkSignal(plugin,"updateView()") )
        connect(plugin,SIGNAL(updateView()),this,SLOT(updateView()));

469

Dirk Wilden's avatar
Dirk Wilden committed
470
471
472
473
474
475
      if ( checkSignal(plugin,"updatedObject(int)") && checkSignal(plugin,"updatedObject(int,const UpdateType)") ){
        
        log(LOGERR,tr("Plugin uses deprecated and(!) new updatedObject. Only new updatedObject will be active."));
        connect(plugin,SIGNAL(updatedObject(int,const UpdateType)),this,SLOT(slotObjectUpdated(int,const UpdateType)), Qt::DirectConnection);
        
      } else {
476

Dirk Wilden's avatar
Dirk Wilden committed
477
478
479
480
481
482
483
484
        if ( checkSignal(plugin,"updatedObject(int)") ){
          log(LOGWARN,tr("Plugin uses deprecated updatedObject."));
          connect(plugin,SIGNAL(updatedObject(int)),this,SLOT(slotObjectUpdated(int)), Qt::DirectConnection);
        }

        if ( checkSignal(plugin,"updatedObject(int,const UpdateType)") )
          connect(plugin,SIGNAL(updatedObject(int,const UpdateType)),this,SLOT(slotObjectUpdated(int,const UpdateType)), Qt::DirectConnection);
      }
485

Dirk Wilden's avatar
Dirk Wilden committed
486
487
488
      if ( checkSlot( plugin , "slotObjectUpdated(int)" ) && checkSlot( plugin , "slotObjectUpdated(int,const UpdateType)" ) ){
        
        log(LOGERR,tr("Plugin uses deprecated and(!) new slotObjectUpdated. Only new slotObjectUpdated will be active."));
489
        connect(this,SIGNAL(signalObjectUpdated(int)),plugin,SLOT(slotObjectUpdated(int)), Qt::DirectConnection);
Dirk Wilden's avatar
Dirk Wilden committed
490
491
      
      } else {
492

Dirk Wilden's avatar
Dirk Wilden committed
493
494
495
496
497
498
499
500
        if ( checkSlot( plugin , "slotObjectUpdated(int)" ) ){
          log(LOGWARN,tr("Plugin uses deprecated slotObjectUpdated."));
          connect(this,SIGNAL(signalObjectUpdated(int)),plugin,SLOT(slotObjectUpdated(int)), Qt::DirectConnection);
        }

        if ( checkSlot( plugin , "slotObjectUpdated(int,const UpdateType)" ) )
          connect(this,SIGNAL(signalObjectUpdated(int,const UpdateType)),plugin,SLOT(slotObjectUpdated(int,const UpdateType)), Qt::DirectConnection);
      }
501

502
503
504
505
506
507
      if ( checkSignal(plugin,"objectPropertiesChanged(int)")) {
        emit log (LOGERR,tr("Signal objectPropertiesChanged(int) is deprecated. " ));
        emit log (LOGERR,tr("The signal will be automatically emitted by the object that has been changed and the core will deliver it to the plugins!. "));
        emit log (LOGERR,tr("Please remove this signal from your plugins!. "));
//         connect(plugin,SIGNAL(objectPropertiesChanged(int)),this,SLOT(slotObjectPropertiesChanged(int)), Qt::DirectConnection);
      }
508
509
510
      
      if ( checkSlot( plugin , "slotViewChanged()" ) )
        connect(this,SIGNAL(pluginViewChanged()),plugin,SLOT(slotViewChanged()), Qt::DirectConnection);
Jan Möbius's avatar
Jan Möbius committed
511
512
513

      if ( checkSlot(plugin,"slotObjectPropertiesChanged(int)"))
        connect(this,SIGNAL(objectPropertiesChanged(int)),plugin,SLOT(slotObjectPropertiesChanged(int)), Qt::DirectConnection);
Jan Möbius's avatar
Jan Möbius committed
514

Jan Möbius's avatar
Jan Möbius committed
515
      if ( checkSignal(plugin,"visibilityChanged()" ) )
516
        emit log (LOGERR,tr("Signal visibilityChanged() now requires objectid or -1 as argument " ));
Jan Möbius's avatar
 
Jan Möbius committed
517

518
519
520
521
522
523
524
525
526
      if ( checkSignal(plugin,"visibilityChanged(int)") ) {
        emit log (LOGERR,tr("Signal visibilityChanged(int) is deprecated! " ));
        emit log (LOGERR,tr("If an object changes its visibility, it will call the required functions automatically." ));
        emit log (LOGERR,tr("If you change a scenegraph node, call nodeVisibilityChanged(int). See docu of this function for details." ));
      }
      
      if ( checkSignal(plugin,"nodeVisibilityChanged(int)") )
        connect(plugin,SIGNAL(nodeVisibilityChanged(int)),this,SLOT(slotVisibilityChanged(int)), Qt::DirectConnection);
      
527
528
529
530
531

      if ( checkSlot(plugin,"slotVisibilityChanged(int)") )
        connect(this,SIGNAL(visibilityChanged(int)),plugin,SLOT(slotVisibilityChanged(int)), Qt::DirectConnection);

      if ( checkSignal(plugin,"activeObjectChanged()" ) )
532
        emit log (LOGERR,tr("Signal activeObjectChanged() is now objectSelectionChanged( int _objectId ) ") );
533

Jan Möbius's avatar
Jan Möbius committed
534
      if ( checkSlot(plugin,"slotActiveObjectChanged()" ) )
535
        emit log (LOGERR,tr("Slot slotActiveObjectChanged() is now slotObjectSelectionChanged( int _objectId ) ") );
Jan Möbius's avatar
 
Jan Möbius committed
536

Jan Möbius's avatar
Jan Möbius committed
537
538
      if ( checkSlot(plugin,"slotAllCleared()") )
        connect(this,SIGNAL(allCleared()),plugin,SLOT(slotAllCleared()));
539

Jan Möbius's avatar
 
Jan Möbius committed
540

541
542
543
544
      if ( checkSignal(plugin,"objectSelectionChanged(int)") ) {
        emit log (LOGERR,tr("Signal objectSelectionChanged(in) is deprecated!") );
        emit log (LOGERR,tr("If the selection for an object is changed, the core will emit the required signals itself!") );
      }
545
546

      if ( checkSlot( plugin , "slotObjectSelectionChanged(int)" ) )
547
        connect(this,SIGNAL(objectSelectionChanged(int)),plugin,SLOT(slotObjectSelectionChanged(int) ), Qt::DirectConnection);
Jan Möbius's avatar
 
Jan Möbius committed
548
549
550
551


      if ( checkSlot( plugin , "pluginsInitialized()" ) )
        connect(this,SIGNAL(pluginsInitialized()),plugin,SLOT(pluginsInitialized()), Qt::DirectConnection);
552
553
554
555

      if ( checkSignal(plugin,"setSlotDescription(QString,QString,QStringList,QStringList)") )
        connect(plugin, SIGNAL(setSlotDescription(QString,QString,QStringList,QStringList)),
                this,   SLOT(slotSetSlotDescription(QString,QString,QStringList,QStringList)) );
Jan Möbius's avatar
 
Jan Möbius committed
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
    }

    //Check if the plugin supports Logging
    LoggingInterface* logPlugin = qobject_cast< LoggingInterface * >(plugin);
    if ( logPlugin ) {
      supported = supported + "Logging ";

      // Create intermediate logger class which will mangle the output
      PluginLogger* newlog = new PluginLogger(info.name);
      loggers_.push_back(newlog);
      connect(plugin,SIGNAL(log(Logtype, QString )),newlog,SLOT(slotLog(Logtype, QString )),Qt::DirectConnection);
      connect(plugin,SIGNAL(log(QString )),newlog,SLOT(slotLog(QString )),Qt::DirectConnection);

      // Connect it to the core widget logger
      if ( OpenFlipper::Options::gui() )
        connect(newlog,SIGNAL(log(Logtype, QString )),coreWidget_,SLOT(slotLog(Logtype, QString )),Qt::DirectConnection);

      // connection to console logger
      connect(newlog,SIGNAL(log(Logtype, QString )),this,SLOT(slotLog(Logtype, QString )),Qt::DirectConnection);

Dirk Wilden's avatar
Dirk Wilden committed
576
577
578
      // connection to file logger
      connect(newlog,SIGNAL(log(Logtype, QString )),this,SLOT(slotLogToFile(Logtype, QString )),Qt::DirectConnection);

Jan Möbius's avatar
 
Jan Möbius committed
579
580
581
582
583
584
585
586
587
588
      // connection to external plugin logger
      if ( checkSlot(plugin,"logOutput(Logtype,QString)") )
        connect(this,SIGNAL(externalLog(Logtype,QString)), plugin, SLOT(logOutput(Logtype,QString)) ) ;
    }

    //Check if the plugin supports Menubar-Interface
    MenuInterface* menubarPlugin = qobject_cast< MenuInterface * >(plugin);
    if ( menubarPlugin && OpenFlipper::Options::gui() ) {
      supported = supported + "Menubar ";

Jan Möbius's avatar
Jan Möbius committed
589
590
591
592
593
594
      if ( checkSignal(plugin,"addMenubarAction(QAction*,QString)") )
        connect(plugin      , SIGNAL(addMenubarAction(QAction*,QString)),
                coreWidget_ , SLOT(slotAddMenubarAction(QAction*,QString)),Qt::DirectConnection);
      if ( checkSignal(plugin,"getMenubarMenu (QString,QMenu*&,bool)") )
        connect(plugin      , SIGNAL(getMenubarMenu (QString,QMenu*&,bool)),
                coreWidget_ , SLOT(slotGetMenubarMenu (QString,QMenu*&,bool)),Qt::DirectConnection);
Jan Möbius's avatar
 
Jan Möbius committed
595
596
597
598
599
600
601
    }

    //Check if the plugin supports ContextMenuInterface
    ContextMenuInterface* contextMenuPlugin = qobject_cast< ContextMenuInterface * >(plugin);
    if ( contextMenuPlugin && OpenFlipper::Options::gui() ) {
      supported = supported + "ContextMenu ";

Jan Möbius's avatar
   
Jan Möbius committed
602
603
604
      if ( checkSignal(plugin,"addContextMenuItem(QAction*,ContextMenuType)") )
        connect(plugin      , SIGNAL(addContextMenuItem(QAction*,ContextMenuType)),
                coreWidget_ , SLOT(slotAddContextItem(QAction*,ContextMenuType)),Qt::DirectConnection);
Jan Möbius's avatar
 
Jan Möbius committed
605

Jan Möbius's avatar
   
Jan Möbius committed
606
607
608
      if ( checkSignal(plugin,"addContextMenuItem(QAction*,DataType,ContextMenuType)") )
        connect(plugin      , SIGNAL(addContextMenuItem(QAction*,DataType,ContextMenuType)),
                coreWidget_ , SLOT(slotAddContextItem(QAction*,DataType,ContextMenuType)),Qt::DirectConnection);
Jan Möbius's avatar
 
Jan Möbius committed
609
610
611
612
613

      if ( checkSlot(plugin,"slotUpdateContextMenu(int)") )
        connect(coreWidget_ , SIGNAL(updateContextMenu(int)),
                plugin      , SLOT(slotUpdateContextMenu(int)),Qt::DirectConnection);

614
615
616
617
618
619
620
      if ( checkSlot(plugin,"slotUpdateContextMenuNode(int)") )
        connect(coreWidget_ , SIGNAL(updateContextMenuNode(int)),
                plugin      , SLOT(slotUpdateContextMenuNode(int)),Qt::DirectConnection);

      if ( checkSlot(plugin,"slotUpdateContextMenuBackground()") )
        connect(coreWidget_ , SIGNAL(updateContextMenuBackground()),
                plugin      , SLOT(slotUpdateContextMenuBackground()),Qt::DirectConnection);
Jan Möbius's avatar
 
Jan Möbius committed
621
622
623
624
625
626
627
628
    }

    //Check if the plugin supports Toolbox-Interface
    ToolboxInterface* toolboxPlugin = qobject_cast< ToolboxInterface * >(plugin);
    if ( toolboxPlugin && OpenFlipper::Options::gui() ) {
      supported = supported + "Toolbox ";


629
630
      if ( checkSignal(plugin, "addToolbox(QString,QWidget*)"))
        connect(plugin, SIGNAL( addToolbox(QString,QWidget*) ),
Jan Möbius's avatar
Jan Möbius committed
631
                this, SLOT( addToolbox(QString,QWidget*) ),Qt::DirectConnection );
632
633
634



Jan Möbius's avatar
 
Jan Möbius committed
635
    }
Jan Möbius's avatar
Jan Möbius committed
636
637
638
639
640
641
642
643
644
645
    
    //Check if the plugin supports ViewMode-Interface
    ViewModeInterface* viewModePlugin = qobject_cast< ViewModeInterface * >(plugin);
    if ( viewModePlugin && OpenFlipper::Options::gui() ) {
      supported = supported + "ViewMode ";
      
      if ( checkSignal(plugin, "defineViewModeToolboxes(QString,QStringList)"))
        connect(plugin, SIGNAL( defineViewModeToolboxes(QString, QStringList) ),
                coreWidget_, SLOT( slotAddViewModeToolboxes(QString, QStringList) ),Qt::DirectConnection );
                
646
647
648
649
      if ( checkSignal(plugin, "defineViewModeToolbars(QString,QStringList)"))
        connect(plugin, SIGNAL( defineViewModeToolbars(QString, QStringList) ),
                coreWidget_, SLOT( slotAddViewModeToolbars(QString, QStringList) ),Qt::DirectConnection );                
                
650
651
652
653
      if ( checkSignal(plugin, "defineViewModeIcon(QString,QString)"))
        connect(plugin, SIGNAL( defineViewModeIcon(QString, QString) ),
                coreWidget_, SLOT( slotSetViewModeIcon(QString, QString) ),Qt::DirectConnection );                          
                
Jan Möbius's avatar
Jan Möbius committed
654
    }    
Jan Möbius's avatar
 
Jan Möbius committed
655

Dirk Wilden's avatar
Dirk Wilden committed
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
    //Check if the plugin supports Options-Interface
    OptionsInterface* optionsPlugin = qobject_cast< OptionsInterface * >(plugin);
    if ( optionsPlugin && OpenFlipper::Options::gui() ) {
      supported = supported + "Options ";

      QWidget* widget = 0;
      if ( optionsPlugin->initializeOptionsWidget( widget ) ) {
            info.optionsWidget = widget;

            if ( checkSlot(plugin,"applyOptions()") )
              connect(coreWidget_ , SIGNAL( applyOptions() ),
                      plugin      , SLOT( applyOptions() ),Qt::DirectConnection);
      }
    }

    //Check if the plugin supports Toolbar-Interface
Jan Möbius's avatar
 
Jan Möbius committed
672
673
674
675
676
677
678
679
680
681
682
    ToolbarInterface* toolbarPlugin = qobject_cast< ToolbarInterface * >(plugin);
    if ( toolbarPlugin && OpenFlipper::Options::gui() ) {
      supported = supported + "Toolbars ";

      if ( checkSignal(plugin,"addToolbar(QToolBar*)") )
        connect(plugin,SIGNAL(addToolbar(QToolBar*)),
                coreWidget_,SLOT(slotAddToolbar(QToolBar*)),Qt::DirectConnection);

      if ( checkSignal(plugin,"removeToolbar(QToolBar*)") )
        connect(plugin,SIGNAL(removeToolbar(QToolBar*)),
                coreWidget_,SLOT(slotRemoveToolbar(QToolBar*)),Qt::DirectConnection);
Jan Möbius's avatar
Jan Möbius committed
683
684
685
686

      if ( checkSignal(plugin,"getToolBar(QString,QToolBar*&)") )
        connect(plugin,SIGNAL(getToolBar(QString,QToolBar*&)),
                coreWidget_,SLOT(getToolBar(QString,QToolBar*&)),Qt::DirectConnection);
687
          
Jan Möbius's avatar
 
Jan Möbius committed
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
    }

    //Check if the plugin supports StatusBar-Interface
    StatusbarInterface* statusbarPlugin = qobject_cast< StatusbarInterface * >(plugin);
    if ( statusbarPlugin && OpenFlipper::Options::gui() ) {
      supported = supported + "StatusBar ";

      if ( checkSignal(plugin,"showStatusMessage(QString,int)") )
        connect(plugin,SIGNAL(showStatusMessage(QString,int)),
                coreWidget_,SLOT(statusMessage(QString,int)),Qt::DirectConnection);


      if ( checkSignal(plugin,"setStatus(ApplicationStatus::applicationStatus)") )
        connect(plugin,SIGNAL(setStatus(ApplicationStatus::applicationStatus)),
                coreWidget_,SLOT(setStatus(ApplicationStatus::applicationStatus)),Qt::DirectConnection);

      if ( checkSignal(plugin,"clearStatusMessage()") )
        connect(plugin,SIGNAL(clearStatusMessage()),
                coreWidget_,SLOT(clearStatusMessage()));
Dirk Wilden's avatar
Dirk Wilden committed
707
708
709
                
      if ( checkSignal(plugin,"addWidgetToStatusbar(QWidget*)") )
        connect(plugin,SIGNAL(addWidgetToStatusbar(QWidget*)), coreWidget_,SLOT(addWidgetToStatusbar(QWidget*)));
Jan Möbius's avatar
 
Jan Möbius committed
710
711
712
713
714
715
716
    }

    //Check if the plugin supports Key-Interface
    KeyInterface* keyPlugin = qobject_cast< KeyInterface * >(plugin);
    if ( keyPlugin && OpenFlipper::Options::gui() ) {
      supported = supported + "KeyboardEvents ";

Dirk Wilden's avatar
Dirk Wilden committed
717
718
719
      if ( checkSignal(plugin,"registerKey(int,Qt::KeyboardModifiers,QString,bool)") )
        connect(plugin,SIGNAL( registerKey(int, Qt::KeyboardModifiers, QString, bool) ),
                coreWidget_,SLOT(slotRegisterKey(int, Qt::KeyboardModifiers, QString, bool)) );
Dirk Wilden's avatar
Dirk Wilden committed
720
721
722

//       if ( checkSlot( plugin , "slotKeyEvent(QKeyEvent*)" ) )
//         connect(coreWidget_,SIGNAL(PluginKeyEvent(QKeyEvent* )), plugin,SLOT(slotKeyEvent(QKeyEvent*)));
723
//
Dirk Wilden's avatar
Dirk Wilden committed
724
725
//       if ( checkSlot( plugin , "slotKeyReleaseEvent(QKeyEvent*)" ) )
//         connect(coreWidget_,SIGNAL(PluginKeyReleaseEvent(QKeyEvent* )), plugin,SLOT(slotKeyReleaseEvent(QKeyEvent*)));
Jan Möbius's avatar
 
Jan Möbius committed
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
    }

    //Check if the plugin supports Mouse-Interface
    MouseInterface* mousePlugin = qobject_cast< MouseInterface * >(plugin);
    if ( mousePlugin && OpenFlipper::Options::gui()  ) {
      supported = supported + "MouseEvents ";

      if ( checkSlot( plugin , "slotMouseWheelEvent(QWheelEvent*,const std::string&)" ) )
        connect(this   , SIGNAL(PluginWheelEvent(QWheelEvent * , const std::string & )),
                plugin , SLOT(slotMouseWheelEvent(QWheelEvent* , const std::string & )));

      if ( checkSlot( plugin , "slotMouseEvent(QMouseEvent*)" ) )
        connect(this   , SIGNAL(PluginMouseEvent(QMouseEvent*)),
                plugin , SLOT(slotMouseEvent(QMouseEvent*)));

      if ( checkSlot( plugin , "slotMouseEventIdentify(QMouseEvent*)" ) )
        connect(this   , SIGNAL(PluginMouseEventIdentify(QMouseEvent*)),
                plugin , SLOT(slotMouseEventIdentify(QMouseEvent*)));

    }

    //Check if the plugin supports Picking-Interface
    PickingInterface* pickPlugin = qobject_cast< PickingInterface * >(plugin);
    if ( pickPlugin && OpenFlipper::Options::gui() ) {
      supported = supported + "Picking ";

      if ( checkSlot( plugin , "slotPickModeChanged(const std::string&)" ) )
753
        connect(coreWidget_,SIGNAL(signalPickModeChanged (const std::string &)),
Jan Möbius's avatar
 
Jan Möbius committed
754
755
756
757
758
759
760
761
762
                plugin,SLOT(slotPickModeChanged( const std::string &)));

      if ( checkSignal(plugin,"addPickMode(const std::string)") )
        connect(plugin,SIGNAL(addPickMode( const std::string )),
                this,SLOT(slotAddPickMode( const std::string )),Qt::DirectConnection);

      if ( checkSignal(plugin,"addHiddenPickMode(const std::string)") )
        connect(plugin,SIGNAL(addHiddenPickMode( const std::string )),
                this,SLOT(slotAddHiddenPickMode( const std::string )),Qt::DirectConnection);
763

Dirk Wilden's avatar
Dirk Wilden committed
764
      if ( checkSignal(plugin,"setPickModeCursor(const std::string,QCursor)") )
765
766
        for ( uint i = 0 ; i < OpenFlipper::Options::examinerWidgets() ; ++i )
          connect(plugin,SIGNAL(setPickModeCursor( const std::string ,QCursor)),
767
                  coreWidget_,SLOT(setPickModeCursor( const std::string ,QCursor)),Qt::DirectConnection);
768

Dirk Wilden's avatar
Dirk Wilden committed
769
      if ( checkSignal(plugin,"setPickModeMouseTracking(const std::string,bool)") )
770
771
        for ( uint i = 0 ; i < OpenFlipper::Options::examinerWidgets() ; ++i )
          connect(plugin,SIGNAL(setPickModeMouseTracking( const std::string ,bool)),
772
                  coreWidget_,SLOT(setPickModeMouseTracking( const std::string ,bool)),Qt::DirectConnection);
Jan Möbius's avatar
Dennis:    
Jan Möbius committed
773
774
775
776
777
778
779
780
781

      if ( checkSignal(plugin,"setPickModeToolbar(const std::string,QToolBar*)") )
        connect(plugin,SIGNAL(setPickModeToolbar (const std::string, QToolBar*)),
                coreWidget_,SLOT(setPickModeToolbar (const std::string, QToolBar*)),Qt::DirectConnection);

      if ( checkSignal(plugin,"removePickModeToolbar(const std::string)") )
        connect(plugin,SIGNAL(removePickModeToolbar( const std::string)),
                coreWidget_,SLOT(removePickModeToolbar( const std::string)),Qt::DirectConnection);

Jan Möbius's avatar
 
Jan Möbius committed
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
    }

    //Check if the plugin supports INI-Interface
    INIInterface* iniPlugin = qobject_cast< INIInterface * >(plugin);
    if ( iniPlugin ) {
      supported = supported + "INIFile ";

      if ( checkSlot( plugin , "loadIniFile(INIFile&,int)" ) )
        connect(this    , SIGNAL(iniLoad( INIFile&,int)),
                plugin  , SLOT( loadIniFile( INIFile&,int) ),Qt::DirectConnection);

      if ( checkSlot( plugin , "saveIniFile(INIFile&,int)" ) )
        connect(this    , SIGNAL(iniSave( INIFile& , int )),
                plugin  , SLOT( saveIniFile( INIFile& , int ) ),Qt::DirectConnection);

      if ( checkSlot( plugin , "saveIniFileOptions(INIFile&)" ) )
        connect(this    , SIGNAL(iniSaveOptions( INIFile& )),
                plugin  , SLOT( saveIniFileOptions( INIFile& ) ),Qt::DirectConnection);

801
802
803
804
      if ( checkSlot( plugin , "saveOnExit(INIFile&)" ) )
        connect(this    , SIGNAL(saveOnExit( INIFile& )),
                plugin  , SLOT( saveOnExit( INIFile& ) ),Qt::DirectConnection);

Jan Möbius's avatar
 
Jan Möbius committed
805
806
807
      if ( checkSlot( plugin , "loadIniFileOptions(INIFile&)" ) )
        connect(this    , SIGNAL(iniLoadOptions( INIFile& )),
                plugin  , SLOT( loadIniFileOptions( INIFile& ) ),Qt::DirectConnection);
808
809
810
811

      if ( checkSlot( plugin , "loadIniFileOptionsLast(INIFile&)" ) )
        connect(this    , SIGNAL(iniLoadOptionsLast( INIFile& )),
                plugin  , SLOT( loadIniFileOptionsLast( INIFile& ) ),Qt::DirectConnection);
Jan Möbius's avatar
 
Jan Möbius committed
812
813
814
815
816
817
818
    }

    //Check if the plugin supports Texture-Interface
    TextureInterface* texturePlugin = qobject_cast< TextureInterface * >(plugin);
    if ( texturePlugin && OpenFlipper::Options::gui() ) {
      supported = supported + "Textures ";

Dirk Wilden's avatar
Dirk Wilden committed
819
820
821
822
823
824
825
826
      if ( checkSignal(plugin,"addTexture(QString,QString,uint,int)") )
        connect(plugin , SIGNAL(addTexture( QString , QString , uint , int )),
                this   , SLOT(slotAddTexture(QString, QString, uint, int)),Qt::DirectConnection);

      if ( checkSlot( plugin , "slotTextureAdded(QString,QString,uint,int)" ) )
        connect(this   , SIGNAL(addTexture(QString,QString, uint, int)),
                plugin , SLOT(slotTextureAdded(QString,QString, uint, int)),Qt::DirectConnection);

Jan Möbius's avatar
 
Jan Möbius committed
827
828
829
830
831
832
833
834
835
836
      if ( checkSignal(plugin,"addTexture(QString,QString,uint)") )
        connect(plugin , SIGNAL(addTexture( QString , QString , uint )),
                this   , SLOT(slotAddTexture(QString, QString, uint)),Qt::DirectConnection);

      if ( checkSlot( plugin , "slotTextureAdded(QString,QString,uint)" ) )
        connect(this   , SIGNAL(addTexture(QString,QString, uint)),
                plugin , SLOT(slotTextureAdded(QString,QString, uint)),Qt::DirectConnection);

      if ( checkSignal(plugin,"updateTexture(QString,int)") )
        connect(plugin , SIGNAL(updateTexture( QString ,int )),
837
                this   , SLOT(slotUpdateTexture(QString , int)),Qt::DirectConnection);
Jan Möbius's avatar
 
Jan Möbius committed
838
839
840

      if ( checkSlot( plugin , "slotUpdateTexture(QString,int)" ) )
        connect(this   , SIGNAL(updateTexture(QString ,int)),
841
                plugin , SLOT(slotUpdateTexture(QString,int )),Qt::DirectConnection);
Jan Möbius's avatar
 
Jan Möbius committed
842
843
844
845
846
847
848
849
850
851
852

      if ( checkSignal(plugin,"updateAllTextures()") )
        connect(plugin , SIGNAL(updateAllTextures()),
                this   , SLOT(slotUpdateAllTextures()));

      if ( checkSlot( plugin , "slotUpdateAllTextures()" ) )
        connect(this   , SIGNAL(updateAllTextures()),
                plugin , SLOT(slotUpdateAllTextures()));

      if ( checkSignal(plugin,"updatedTextures(QString,int)") )
        connect(plugin , SIGNAL(updatedTextures( QString , int )),
853
                this   , SLOT(slotTextureUpdated( QString, int ) ),Qt::DirectConnection);
Jan Möbius's avatar
 
Jan Möbius committed
854
855
856

      if ( checkSlot( plugin , "slotTextureUpdated(QString,int)" ) )
        connect(this   , SIGNAL(updatedTextures( QString , int )),
857
                plugin , SLOT(slotTextureUpdated( QString, int ) ),Qt::DirectConnection);
Jan Möbius's avatar
 
Jan Möbius committed
858

Dirk Wilden's avatar
Dirk Wilden committed
859
860
861
862
863
864
865
866
      if ( checkSignal(plugin,"setTextureMode(QString,QString,int)") )
        connect(plugin , SIGNAL(setTextureMode(QString, QString, int )),
                this   , SLOT(slotSetTextureMode(QString, QString, int )),Qt::DirectConnection );

      if ( checkSlot( plugin , "slotSetTextureMode(QString,QString,int)" ) )
        connect(this   , SIGNAL(setTextureMode(QString, QString, int )),
                plugin , SLOT(slotSetTextureMode(QString, QString, int )),Qt::DirectConnection );

Jan Möbius's avatar
 
Jan Möbius committed
867
868
869
870
871
872
873
874
      if ( checkSignal(plugin,"setTextureMode(QString,QString)") )
        connect(plugin , SIGNAL(setTextureMode(QString  ,QString )),
                this   , SLOT(slotSetTextureMode(QString  ,QString )),Qt::DirectConnection );

      if ( checkSlot( plugin , "slotSetTextureMode(QString,QString)" ) )
        connect(this   , SIGNAL(setTextureMode(QString  ,QString )),
                plugin , SLOT(slotSetTextureMode(QString  ,QString )),Qt::DirectConnection );

Dirk Wilden's avatar
Dirk Wilden committed
875
876
877
878
879
880
881
882
      if ( checkSignal(plugin,"switchTexture(QString,int)") )
        connect(plugin , SIGNAL(switchTexture(QString, int )),
                this   , SLOT(slotSwitchTexture(QString, int )),Qt::DirectConnection);

      if ( checkSlot( plugin , "slotSwitchTexture(QString,int)" ) )
        connect(this   , SIGNAL(switchTexture(QString, int )),
                plugin , SLOT(slotSwitchTexture(QString, int )),Qt::DirectConnection);

Jan Möbius's avatar
 
Jan Möbius committed
883
884
885
886
887
888
889
      if ( checkSignal(plugin,"switchTexture(QString)") )
        connect(plugin , SIGNAL(switchTexture(QString )),
                this   , SLOT(slotSwitchTexture(QString )),Qt::DirectConnection);

      if ( checkSlot( plugin , "slotSwitchTexture(QString)" ) )
        connect(this   , SIGNAL(switchTexture(QString )),
                plugin , SLOT(slotSwitchTexture(QString )),Qt::DirectConnection);
890

891
892
893


      if ( checkSignal( plugin , "textureChangeImage(QString,QImage&,int)" ) )
894
895
        connect(plugin   , SIGNAL(textureChangeImage(QString,QImage&,int)),
                this , SLOT(slotTextureChangeImage(QString,QImage&,int)),Qt::DirectConnection);
896
897
898
899
900
901

      if ( checkSlot( plugin , "slotTextureChangeImage(QString,QImage&,int)" ) )
        connect(this   , SIGNAL(textureChangeImage(QString,QImage&,int)),
                plugin , SLOT(slotTextureChangeImage(QString,QImage&,int)),Qt::DirectConnection);

      if ( checkSignal( plugin , "textureChangeImage(QString,QImage&)" ) )
902
903
        connect(plugin   , SIGNAL(textureChangeImage(QString,QImage&)),
                this , SLOT(slotTextureChangeImage(QString,QImage&)),Qt::DirectConnection);
904
905
906
907
908

      if ( checkSlot( plugin , "slotTextureChangeImage(QString,QImage&)" ) )
        connect(this   , SIGNAL(textureChangeImage(QString,QImage&)),
                plugin , SLOT(slotTextureChangeImage(QString,QImage&)),Qt::DirectConnection);

909
910
911
912
913
914
915
916
      if ( checkSignal( plugin , "addMultiTexture(QString,QString,QString,int,int&)" ) )
        connect(plugin   , SIGNAL(addMultiTexture(QString,QString,QString,int,int&) ),
                this , SLOT(slotMultiTextureAdded(QString,QString,QString,int,int&) ),Qt::DirectConnection);

      if ( checkSlot( plugin , "slotMultiTextureAdded( QString,QString,QString,int,int&)" ) )
        connect(this   , SIGNAL(addMultiTexture(QString,QString,QString,int,int&) ),
                plugin , SLOT(slotMultiTextureAdded( QString,QString,QString,int,int&) ),Qt::DirectConnection);

Jan Möbius's avatar
 
Jan Möbius committed
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
    }

    //Check if the plugin supports Backup-Interface
    BackupInterface* backupPlugin = qobject_cast< BackupInterface * >(plugin);
    if ( backupPlugin ) {
      supported = supported + "Backups ";

      if ( checkSignal( plugin , "createBackup(int,QString)" ) )
        connect(plugin , SIGNAL(createBackup( int , QString )) ,
                this   , SLOT(backupRequest( int , QString )),Qt::DirectConnection );

      if ( checkSlot( plugin , "slotBackupRequested(int,QString,int)" ) )
        connect(this   , SIGNAL(createBackup(int,QString,int)) ,
                plugin , SLOT( slotBackupRequested(int,QString,int) ),Qt::DirectConnection);
    }

    //Check if the plugin supports LoadSave-Interface
    LoadSaveInterface* LoadSavePlugin = qobject_cast< LoadSaveInterface * >(plugin);
    if ( LoadSavePlugin ) {
      supported = supported + "Load/Save ";
      if ( checkSignal(plugin,"load( QString,DataType,int& )" ) )
        connect(plugin , SIGNAL(load( QString,DataType,int& )) ,
                this   , SLOT(slotLoad( QString,DataType,int& )),Qt::DirectConnection );
      if ( checkSignal(plugin,"save(int,QString)" ) )
        connect(plugin , SIGNAL( save(int,QString) ) ,
942
                this   , SLOT( saveObject(int,QString) ), Qt::DirectConnection);
Jan Möbius's avatar
 
Jan Möbius committed
943
944
945
946
947
948
949
950
951
952
953
954
955

      if ( checkSlot( plugin , "fileOpened(int)" ) )
        connect(this   , SIGNAL( openedFile( int) ) ,
                plugin , SLOT( fileOpened( int ) ),Qt::DirectConnection);

      if ( checkSignal(plugin,"openedFile(int)" ) )
        connect(plugin , SIGNAL( openedFile( int ) ) ,
                this   , SLOT( slotObjectOpened ( int ) ),Qt::DirectConnection);

      if ( checkSignal(plugin,"addEmptyObject(DataType,int&)" ) )
        connect(plugin , SIGNAL( addEmptyObject( DataType, int& )) ,
                this   , SLOT( slotAddEmptyObject( DataType, int&) ),Qt::DirectConnection);

956
957
958
959
      if ( checkSignal(plugin,"copyObject(int,int&)" ) )
        connect(plugin , SIGNAL( copyObject( int, int& )) ,
                this   , SLOT( slotCopyObject( int, int&) ),Qt::DirectConnection);

960
      // Plugins to core
Jan Möbius's avatar
 
Jan Möbius committed
961
962
963
964
      if ( checkSignal(plugin,"emptyObjectAdded(int)" ) )
        connect(plugin , SIGNAL( emptyObjectAdded( int ) ) ,
                this   , SLOT( slotEmptyObjectAdded ( int ) ),Qt::DirectConnection);

965
      // core to plugins
Dirk Wilden's avatar
Dirk Wilden committed
966
967
968
969
      if ( checkSlot(plugin,"addedEmptyObject(int)" ) )
        connect(this ,   SIGNAL( emptyObjectAdded( int ) ) ,
                plugin   , SLOT( addedEmptyObject( int ) ),Qt::DirectConnection);

Jan Möbius's avatar
 
Jan Möbius committed
970
971
972
973
      if ( checkSignal(plugin,"getAllFilters(QStringList&)" ) )
        connect(plugin , SIGNAL( getAllFilters( QStringList& ) ) ,
                this   , SLOT( slotGetAllFilters ( QStringList& ) ),Qt::DirectConnection);

974
975
976
977
      if ( checkSignal(plugin,"deleteObject(int)" ) )
        connect(plugin , SIGNAL( deleteObject( int ) ) ,
                this   , SLOT( slotDeleteObject( int ) ),Qt::DirectConnection);

978
979
980
981
      if ( checkSignal(plugin,"deleteAllObjects()" ) )
        connect(plugin , SIGNAL( deleteAllObjects() ) ,
                this   , SLOT( slotDeleteAllObjects() ),Qt::DirectConnection);

982
983
984
985
      if ( checkSlot(plugin,"objectDeleted(int)" ) )
        connect(this ,   SIGNAL( objectDeleted( int ) ) ,
                plugin   , SLOT( objectDeleted( int ) ),Qt::DirectConnection);

Jan Möbius's avatar
 
Jan Möbius committed
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
    }

    //Check if the plugin supports View-Interface
    ViewInterface* viewPlugin = qobject_cast< ViewInterface * >(plugin);
    if ( viewPlugin  && OpenFlipper::Options::gui() ) {
      supported = supported + "View ";

      if ( checkSignal(plugin,"getStackWidget(QString,QWidget*&)" ) )
        connect(plugin      , SIGNAL(getStackWidget( QString , QWidget*&)),
                coreWidget_ , SLOT( slotGetStackWidget( QString , QWidget*& ) ) ,Qt::DirectConnection );
      if ( checkSignal(plugin,"addStackWidget(QString,QWidget*)" ) )
        connect(plugin      , SIGNAL(addStackWidget( QString , QWidget*)),
                coreWidget_ , SLOT( slotAddStackWidget( QString , QWidget* ) ) ,Qt::DirectConnection );
      if ( checkSignal(plugin,"updateStackWidget(QString,QWidget*)" ) )
        connect(plugin      , SIGNAL(updateStackWidget( QString , QWidget*)),
                coreWidget_ , SLOT( slotUpdateStackWidget( QString , QWidget* ) ) ,Qt::DirectConnection );
    }
1003
1004
1005
1006
1007
1008
    
    //Check if the plugin supports Process-Interface
    ProcessInterface* processPlugin = qobject_cast< ProcessInterface * >(plugin);
    if ( processPlugin ) {
      supported = supported + "Process ";

1009
1010
      if ( checkSignal(plugin,"startJob(QString,QString,int,int,bool)" ) )
        connect(plugin      , SIGNAL(startJob(QString, QString,int,int,bool)),
1011
                this , SLOT( slotStartJob(QString, QString,int,int,bool) ), Qt::DirectConnection );
1012
1013
1014
1015
1016
      else
        emit log(LOGERR,"Process Interface defined but no startJob signal found!");  
                
      if ( checkSignal(plugin,"setJobState(QString,int)" ) )
        connect(plugin      , SIGNAL(setJobState(QString,int)),
1017
                this , SLOT( slotSetJobState(QString,int) ), Qt::QueuedConnection );
1018
      else
1019
1020
1021
1022
        emit log(LOGERR,"Process Interface defined but no setJobState signal found!");
      
      if ( checkSignal(plugin,"setJobName(QString,QString)" ) )
        connect(plugin ,      SIGNAL(setJobName(QString, QString)),
1023
                this , SLOT( slotSetJobName(QString, QString) ), Qt::QueuedConnection );
1024
1025
1026
1027
1028
      else
        emit log(LOGERR,"Process Interface defined but no setJobName signal found!");
      
      if ( checkSignal(plugin,"setJobDescription(QString,QString)" ) )
        connect(plugin ,      SIGNAL(setJobDescription(QString, QString)),
1029
                this , SLOT( slotSetJobDescription(QString, QString) ), Qt::QueuedConnection );
1030
1031
      else
        emit log(LOGERR,"Process Interface defined but no setJobDescription signal found!");  
1032
1033
1034
                
      if ( checkSignal(plugin,"cancelJob(QString)" ) )
        connect(plugin      , SIGNAL(cancelJob(QString)),
1035
                this , SLOT( slotCancelJob(QString) ), Qt::QueuedConnection );
1036
1037
1038
                
      if ( checkSignal(plugin,"finishJob(QString)" ) )
        connect(plugin      , SIGNAL(finishJob(QString)),
1039
                this , SLOT( slotFinishJob(QString) ), Qt::DirectConnection );
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
      else
        emit log(LOGERR,"Process Interface defined but no finishJob signal found!");                
                
                
      if ( checkSlot(plugin,"canceledJob(QString)" ) ) 
        connect(this ,   SIGNAL( jobCanceled( QString ) ) ,
              plugin   , SLOT( canceledJob(QString) ),Qt::DirectConnection);                
      else
        emit log(LOGERR,"Process Interface defined but no cancel canceledJob slot found!");
    }
Jan Möbius's avatar
 
Jan Möbius committed
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103

    //Check if the plugin supports RPC-Interface
    RPCInterface* rpcPlugin = qobject_cast< RPCInterface * >(plugin);
    if ( rpcPlugin ) {
      supported = supported + "RPC ";

      if ( checkSignal(plugin,"pluginExists(QString,bool&)" ) )
        connect(plugin  , SIGNAL( pluginExists(QString,bool&) ),
                this    , SLOT( slotPluginExists(QString,bool&) ) ,Qt::DirectConnection );
      if ( checkSignal(plugin,"functionExists(QString,QString,bool&)" ) )
        connect(plugin  , SIGNAL(functionExists(QString,QString,bool&)),
                this    , SLOT( slotFunctionExists(QString,QString,bool&) ) ,Qt::DirectConnection );
      if ( checkSignal(plugin,"call(QString,QString,bool&)" ) )
        connect(plugin  , SIGNAL(call(QString,QString,bool&)),
                this    , SLOT(slotCall(QString,QString,bool&)) ,Qt::DirectConnection );
      if ( checkSignal(plugin,"call(QString,bool&)" ) )
        connect(plugin  , SIGNAL(call(QString,bool&)),
                this    , SLOT(slotCall(QString,bool&)) ,Qt::DirectConnection );
      if ( checkSignal(plugin,"getValue(QString,QVariant&)" ) )
        connect(plugin  , SIGNAL(getValue(QString,QVariant&)),
                this    , SLOT(slotGetValue(QString,QVariant&)) ,Qt::DirectConnection );
    }

    //========================================================================================
    // ===          Collect Scripting Information for Plugin      ============================

    QScriptValue scriptInstance = scriptEngine_.newQObject(plugin,
                                                           QScriptEngine::QtOwnership,
                                                           QScriptEngine::ExcludeChildObjects |
                                                           QScriptEngine::ExcludeSuperClassMethods |
                                                           QScriptEngine::ExcludeSuperClassProperties
                                                           );

    // Make plugin available for scripting
    QString scriptingName = info.name.remove(" ").toLower();

    scriptEngine_.globalObject().setProperty(scriptingName, scriptInstance);

    info.rpcName = scriptingName;

    QScriptValueIterator it(scriptInstance);
    while (it.hasNext()) {
      it.next();

      /// Skip all signals for function calls
      if ( checkSignal( plugin, it.name().toAscii() ) )
        continue;

      info.rpcFunctions.push_back( it.name() );

      scriptingFunctions_.push_back( scriptingName + "." + it.name() );

    }

Jan Möbius's avatar
Jan Möbius committed
1104
    //Check if the plugin supports RPC-Interface
Jan Möbius's avatar
 
Jan Möbius committed
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
    ScriptInterface* scriptPlugin = qobject_cast< ScriptInterface * >(plugin);
    if ( scriptPlugin ) {
      supported = supported + "Scripting ";

      // Create intermediate wrapper class which will mangle the call information
      ScriptingWrapper* newScript = new ScriptingWrapper(info.rpcName);
      scriptingWrappers_.push_back(newScript);

      //========= Part one, Scriptinfos via wrapper to core and than to scipting Plugin ==========

      if ( checkSignal(plugin,"scriptInfo(QString)" ) ) {

        // Plugin to wrapper
        connect(plugin    , SIGNAL( scriptInfo(QString) ),
                newScript , SLOT( slotScriptInfo(QString) ) ,Qt::DirectConnection );

        // wrapper to core
        connect(newScript , SIGNAL( scriptInfo(QString,QString) ),
                this      , SLOT( slotScriptInfo(QString,QString) ));
      }

      // Core to plugins ( normally only one scripting plugin)
      if ( checkSlot(plugin,"slotScriptInfo(QString,QString)") ) {
        connect(this      , SIGNAL(scriptInfo(QString,QString)),
                plugin    , SLOT(slotScriptInfo(QString,QString)));
      }

1132
1133
1134
1135
1136
      // Function descriptions
      if ( checkSignal(plugin,"getDescription(QString,QString&,QStringList&,QStringList&)") )
        connect(plugin    , SIGNAL( getDescription(QString,QString&,QStringList&,QStringList&) ),
                this      , SLOT( slotGetDescription(QString,QString&,QStringList&,QStringList&) ));

Jan Möbius's avatar
 
Jan Möbius committed
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
      //========= Script Execution ==========

      // Plugins to Core
      if ( checkSignal(plugin,"executeScript(QString)") )
        connect(plugin      , SIGNAL(executeScript(QString)),
                this       , SLOT(slotExecuteScript(QString)));

      // Core to plugins ( normally only one scripting plugin)
      if ( checkSlot(plugin,"slotExecuteScript(QString)") )
        connect(this      , SIGNAL(executeScript(QString)),
                plugin       , SLOT(slotExecuteScript(QString)));

      // Core to plugins ( normally only one scripting plugin)
      if ( checkSlot(plugin,"slotExecuteFileScript(QString)") )
        connect(this      , SIGNAL(executeFileScript(QString)),
                plugin       , SLOT(slotExecuteFileScript(QString)));

      //========= Engine  ==========

      // Plugins to Core
      if ( checkSignal(plugin,"getScriptingEngine(QScriptEngine*&)") )
        connect(plugin      , SIGNAL(getScriptingEngine(QScriptEngine*&)),
                this       , SLOT(slotGetScriptingEngine(QScriptEngine*&)));

      // Plugins to Core
      if ( checkSignal(plugin,"getAvailableFunctions(QStringList&)") )
        connect(plugin      , SIGNAL(getAvailableFunctions(QStringList&)),
                this       , SLOT(slotGetAllAvailableFunctions(QStringList&)));

    }

    //========================================================================================
    //========================================================================================

    plugins.push_back(info);

    // Initialize Plugin
    if ( basePlugin ) {
      if ( checkSlot(plugin,"initializePlugin()") )
         QMetaObject::invokeMethod(plugin, "initializePlugin",  Qt::DirectConnection);
    }

Jan Möbius's avatar
Jan Möbius committed
1179

1180
1181
1182
1183
1184
1185
1186
    //Check if its a filePlugin
    FileInterface* filePlugin = qobject_cast< FileInterface * >(plugin);
    if ( filePlugin ){
      supported = supported + "File ";

      // Collect supported Data from file plugin
      fileTypes ft;
Dirk Wilden's avatar
Dirk Wilden committed
1187
      ft.name = basePlugin->name();
1188
1189
1190
1191
      ft.type = filePlugin->supportedType();
      ft.loadFilters = filePlugin->getLoadFilters();
      ft.saveFilters = filePlugin->getSaveFilters();
      ft.plugin = filePlugin;
Dirk Wilden's avatar
Dirk Wilden committed
1192
      ft.object = plugin;
1193
      
1194
1195
      supportedTypes_.push_back(ft);
    }
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
    
    //Check if it's a typePlugin
    TypeInterface* typePlugin = qobject_cast< TypeInterface * >(plugin);
    if ( typePlugin ){
      supported = supported + "Type ";
      
      // Call register type
      typePlugin->registerType();

      // Collect supported Data from type plugin
      dataTypes dt;
      dt.name = basePlugin->name();
      dt.type = typePlugin->supportedType();
      dt.plugin = typePlugin;
      
      // Add type info
      supportedDataTypes_.push_back(dt);
1213
      
1214
1215
      // Connect signals ( But only if we not already connected in in the loadsave interface )
      if ( !LoadSavePlugin && checkSignal(plugin,"emptyObjectAdded(int)" ) )
1216
1217
        connect(plugin , SIGNAL( emptyObjectAdded( int ) ) ,
                this   , SLOT( slotEmptyObjectAdded ( int ) ),Qt::DirectConnection);
1218
    }
1219

1220
    emit log(LOGOUT,"================================================================================");
Jan Möbius's avatar
 
Jan Möbius committed
1221
  } else {
Jan Möbius's avatar
Jan Möbius committed
1222
    emit log(LOGERR,tr("Unable to load Plugin :\t %1").arg( filename ) );
1223
    emit log(LOGERR,tr("Error was : ") + loader.errorString() );
1224
    emit log(LOGOUT,"================================================================================");
Jan Möbius's avatar
 
Jan Möbius committed
1225
1226
1227
1228
1229
  }



}