-rw-r--r-- | library/applnk.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/library/applnk.cpp b/library/applnk.cpp index 5763c62..35822dd 100644 --- a/library/applnk.cpp +++ b/library/applnk.cpp | |||
@@ -89,7 +89,11 @@ public: | |||
89 | { | 89 | { |
90 | Categories cat( 0 ); | 90 | Categories cat( 0 ); |
91 | cat.load( categoryFileName() ); | 91 | cat.load( categoryFileName() ); |
92 | mCatList = cat.labels("Document View",mCat); | 92 | // we need to update the names for the mCat... to mCatList |
93 | mCatList.clear(); | ||
94 | for (uint i = 0; i < mCat.count(); i++ ) | ||
95 | mCatList << cat.label("Document View", mCat[i] ); | ||
96 | |||
93 | } | 97 | } |
94 | 98 | ||
95 | void setCatArrayDirty() | 99 | void setCatArrayDirty() |
@@ -406,6 +410,7 @@ AppLnk::AppLnk( const QString &file ) | |||
406 | 410 | ||
407 | AppLnk& AppLnk::operator=(const AppLnk ©) | 411 | AppLnk& AppLnk::operator=(const AppLnk ©) |
408 | { | 412 | { |
413 | if ( this == © ) return *this; | ||
409 | if ( mId ) | 414 | if ( mId ) |
410 | qWarning("Deleting AppLnk that is in an AppLnkSet"); | 415 | qWarning("Deleting AppLnk that is in an AppLnkSet"); |
411 | if ( d ) | 416 | if ( d ) |
@@ -850,7 +855,7 @@ void AppLnk::storeLink() const | |||
850 | if(!rotation().isEmpty()) | 855 | if(!rotation().isEmpty()) |
851 | config.writeEntry("Rotation",rotation()); | 856 | config.writeEntry("Rotation",rotation()); |
852 | else | 857 | else |
853 | config.removeEntry("Rotation"); | 858 | config.removeEntry("Rotation"); |
854 | if ( !mComment.isNull() ) config.writeEntry("Comment",mComment); | 859 | if ( !mComment.isNull() ) config.writeEntry("Comment",mComment); |
855 | QString f = file(); | 860 | QString f = file(); |
856 | int i = 0; | 861 | int i = 0; |