Changeset 2230

Timestamp:

08/26/08 23:07:17 (3 months ago)

Author:

hlamer

Message:

Fixed crash in the XUPItem

Location:

v2/branches/dev

Files:

• config.pri (modified) (1 diff)
• monkey/src/xupmanager/FilteredProjectItemModel.h (modified) (1 diff)
• monkey/src/xupmanager/XUPItem.cpp (modified) (2 diffs)
• monkey/src/xupmanager/XUPProjectItem.cpp (modified) (3 diffs)
• monkey/src/xupmanager/XUPProjectItem.h (modified) (2 diffs)

v2/branches/dev/config.pri

@@ -48 +48 @@
 QMAKE_TARGET_COPYRIGHT  = "Copyright (C) 2005 - 2008 Filipe AZEVEDO"
 PACKAGE_DOMAIN  = "www.monkeystudio.org"
-PACKAGE_VERSION = 1.8.2.2svn
+PACKAGE_VERSION = 1.8.2.2svn_debug
 
 # define variable for source code

v2/branches/dev/monkey/src/xupmanager/FilteredProjectItemModel.h

@@ -9 +9 @@
 #include "XUPItem.h"
 #include "XUPProjectItem.h"
+
+#include <QDebug>
 
 class ProjectItemModel;

v2/branches/dev/monkey/src/xupmanager/XUPItem.cpp

@@ -288 +288 @@
 QString XUPItem::valueName( const QString& s ) const
 {
-        if ( project()->textTypes().contains( s ) ) //FIXME Do it's right?
+        if ( project() && project()->textTypes().contains( s ) ) //FIXME Do it's right?
                 return "text";
         return "name";
@@ -338 +338 @@
 void XUPItem::setModified( bool b, bool e )
 {
-        if ( isProject() && b && !modified() )
-        {
-                mModified = true;
-                if ( e )
-                        emit modifiedChanged( this, true );
-        }
-        else if ( isProject() && !b && modified() )
-        {
-                foreach ( XUPItem* it, children( true, true ) )
-                        if ( it->modified() )
-                                it->setModified( false, false );
-                mModified = false;
-                if ( e )
-                        emit modifiedChanged( this, false );
-        }
-        else if ( mModified != b )
+        if ( mModified != b )
         {
                 mModified = b;

v2/branches/dev/monkey/src/xupmanager/XUPProjectItem.cpp

@@ -9 +9 @@
 XUPItemInfos XUPProjectItem::mXUPItemInfos;
 
-XUPProjectItem::XUPProjectItem( const QDomElement e, const QString& s, bool b )
+XUPProjectItem::XUPProjectItem( const QDomElement e, const QString& s)
 {
 #if 0
@@ -17 +17 @@
         setDomElement( e );
         loadProject( s );
-        setModified( b );
 }
 
@@ -91 +90 @@
 void XUPProjectItem::registerVariableSuffixes( const QString& n, const QStringList& s )
 { mXUPItemInfos.VariableSuffixes[n] = s; }
+
+XUPProjectItem* XUPProjectItem::project()
+{
+        return this;
+}
+
+void XUPProjectItem::setModified( bool b, bool e )
+{
+        if (b && !modified() )
+        {
+                mModified = true;
+                if ( e )
+                        emit modifiedChanged( this, true );
+        }
+        else if (!b && modified() )
+        {
+                foreach ( XUPItem* it, children( true, true ) )
+                        if ( it->modified() )
+                                it->setModified( false, false );
+                mModified = false;
+                if ( e )
+                        emit modifiedChanged( this, false );
+        }
+}
 
 QStringList XUPProjectItem::projectSettingsValues( const QString& variable, const QStringList& defaultValues ) const

v2/branches/dev/monkey/src/xupmanager/XUPProjectItem.h

@@ -12 +12 @@
         static QString mProjectSettingsScope;
 
-        XUPProjectItem( const QDomElement = QDomDocument().toElement(), const QString& = QString(), bool = false );
+        XUPProjectItem( const QDomElement = QDomDocument().toElement(), const QString& = QString());
         
         // register item specific infos
@@ -57 +57 @@
         // return copy of this item
         virtual XUPProjectItem* clone( bool = true ) const = 0;
+
+        // return the project item of this item (this!!!). Implemented for overloading of XUPItem's function
+        virtual XUPProjectItem* project();
+        
+        // set item modified state and emit modified signal according to second parameter
+        virtual void setModified( bool, bool = true );
         
         // return a project settings value