From a216c12f36dadd3e0da840d737b22f8df6263902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 26 Oct 2011 10:14:46 +0000 Subject: [PATCH] Updated to correct backup slots git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@12696 383ad7c9-94d9-4d36-a494-682f7c89f535 --- TextureControl.cc | 9 ++------- TextureControl.hh | 5 ++--- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/TextureControl.cc b/TextureControl.cc index bee650d..5416cad 100644 --- a/TextureControl.cc +++ b/TextureControl.cc @@ -1814,7 +1814,7 @@ void TextureControlPlugin::getCoordinates1D(QString _textureName, int _id, std:: } -void TextureControlPlugin::slotAboutToRestore( int _objectid, int /*_internalId*/) { +void TextureControlPlugin::slotAboutToRestore( int _objectid ) { // ================================================================================ // Get current object @@ -1845,8 +1845,7 @@ void TextureControlPlugin::slotAboutToRestore( int _objectid, int /*_internalId* } -void TextureControlPlugin::slotRestore( int _objectid, int /*_internalId*/) { - +void TextureControlPlugin::slotRestored( int _objectid ) { // ================================================================================ // Get the last active texture in the restored perObjectData // ================================================================================ @@ -1859,9 +1858,5 @@ void TextureControlPlugin::slotRestore( int _objectid, int /*_internalId*/) { slotSwitchTexture(currentTexture,_objectid); } -void TextureControlPlugin::slotRestored( int /*_objectid*/, int /*_internalId*/) { - // Nothing to do yet -} - Q_EXPORT_PLUGIN2( texturecontrolplugin , TextureControlPlugin ); diff --git a/TextureControl.hh b/TextureControl.hh index b07d0ae..3982c66 100644 --- a/TextureControl.hh +++ b/TextureControl.hh @@ -133,9 +133,8 @@ class TextureControlPlugin : public QObject, BaseInterface, BackupInterface, Tex void addedEmptyObject( int _id ); //BackupInterface - void slotAboutToRestore( int _objectid , int _internalId); - void slotRestore( int _objectid, int _internalId); - void slotRestored( int _objectid, int _internalId); + void slotAboutToRestore( int _objectid ); + void slotRestored( int _objectid); private slots: -- GitLab