[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/kio/kio
From:       Waldo Bastian <bastian () kde ! org>
Date:       2004-02-02 11:15:38
Message-ID: 20040202111538.0A4EF997E () office ! kde ! org
[Download RAW message or body]

CVS commit by waba: 

KFileMetaInfo items must be valid when accessed.


  M +21 -7     kfilemetainfo.cpp   1.79


--- kdelibs/kio/kio/kfilemetainfo.cpp  #1.78:1.79
@@ -21,4 +21,6 @@
  */
 
+#include <assert.h>
+
 #include <qshared.h>
 #include <qdict.h>
@@ -355,4 +357,5 @@ KFileMetaInfo::~KFileMetaInfo()
 QStringList KFileMetaInfo::supportedGroups() const
 {
+    assert(isValid());
     return d->mimeTypeInfo->supportedGroups();
 }
@@ -360,4 +363,5 @@ QStringList KFileMetaInfo::supportedGrou
 QStringList KFileMetaInfo::supportedKeys() const
 {
+    assert(isValid());
     return d->mimeTypeInfo->supportedKeys();
 }
@@ -390,4 +394,5 @@ QStringList KFileMetaInfo::editableGroup
 QStringList KFileMetaInfo::preferredGroups() const
 {
+    assert(isValid());
     QStringList list = groups();
     QStringList newlist;
@@ -437,4 +442,5 @@ KFileMetaInfoGroup KFileMetaInfo::group(
 bool KFileMetaInfo::addGroup( const QString& name )
 {
+    assert(isValid());
     if ( d->mimeTypeInfo->supportedGroups().contains(name) &&
          ! d->groups.contains(name) )
@@ -559,4 +565,5 @@ bool KFileMetaInfo::applyChanges()
 KFilePlugin * const KFileMetaInfo::plugin() const
 {
+    assert(isValid());
     KFileMetaInfoProvider* prov = KFileMetaInfoProvider::self();
     return prov->plugin( d->mimeTypeInfo->mimeType() );
@@ -565,4 +572,5 @@ KFilePlugin * const KFileMetaInfo::plugi
 QString KFileMetaInfo::mimeType() const
 {
+    assert(isValid());
     return d->mimeTypeInfo->mimeType();
 }
@@ -611,4 +619,5 @@ KFileMetaInfoItem KFileMetaInfo::saveIte
                                            bool createGroup )
 {
+    assert(isValid());
     // try the preferred groups first
     if ( !preferredGroup.isEmpty() ) {
@@ -675,4 +684,5 @@ KFileMetaInfoItem KFileMetaInfo::findEdi
                                                    const QString& key )
 {
+    assert(isValid());
     KFileMetaInfoItem item = group.addItem( key );
     if ( item.isValid() && item.isEditable() )
@@ -687,4 +697,5 @@ KFileMetaInfoItem KFileMetaInfo::findEdi
 KFileMetaInfoGroup KFileMetaInfo::appendGroup(const QString& name)
 {
+    assert(isValid());
     if ( d->mimeTypeInfo->supportedGroups().contains(name) &&
          ! d->groups.contains(name) )
@@ -1102,8 +1113,5 @@ bool KFileMetaInfoGroup::isEmpty() const
 QStringList KFileMetaInfoGroup::preferredKeys() const
 {
-    if (d == Data::makeNull())
-          kdWarning(7033) << "attempt to get the preferredKeys of "
-                              "an invalid metainfo group";
-
+    assert(isValid());
     QStringList list = keys();
     QStringList newlist;
@@ -1151,4 +1159,5 @@ QStringList KFileMetaInfoGroup::keys() c
 QString KFileMetaInfoGroup::translatedName() const
 {
+    assert(isValid());
     return d->mimeTypeInfo->groupInfo(d->name)->translatedName();
 }
@@ -1156,4 +1165,5 @@ QString KFileMetaInfoGroup::translatedNa
 QStringList KFileMetaInfoGroup::supportedKeys() const
 {
+    assert(isValid());
       return d->mimeTypeInfo->groupInfo(d->name)->supportedKeys();
 }
@@ -1161,4 +1171,5 @@ QStringList KFileMetaInfoGroup::supporte
 bool KFileMetaInfoGroup::supportsVariableKeys() const
 {
+    assert(isValid());
       return d->mimeTypeInfo->groupInfo(d->name)->supportsVariableKeys();
 }
@@ -1196,4 +1207,5 @@ QString KFileMetaInfoGroup::name() const
 uint KFileMetaInfoGroup::attributes() const
 {
+    assert(isValid());
     return d->mimeTypeInfo->groupInfo(d->name)->attributes();
 }
@@ -1231,4 +1243,5 @@ void KFileMetaInfoGroup::deref()
 KFileMetaInfoItem KFileMetaInfoGroup::addItem( const QString& key )
 {
+    assert(isValid());
     QMapIterator<QString,KFileMetaInfoItem> it = d->items.find( key );
     if ( it != d->items.end() )
@@ -1298,4 +1311,5 @@ KFileMetaInfoItem KFileMetaInfoGroup::ap
                                                  const QVariant& value)
 {
+    assert(isValid());
     const KFileMimeTypeInfo::GroupInfo* ginfo = d->mimeTypeInfo->groupInfo(d->name);
     if ( !ginfo ) {


[prev in list] [next in list] [prev in thread] [next in thread]