Merged branches from BRANCH_1_0

1 files changed, 0 insertions, 2 deletions

diff --git a/library/applnk.h b/library/applnk.h
index b4590d3..87971f7 100644
--- a/library/applnk.h
+++ b/library/applnk.h
@@ -65,51 +65,49 @@ public:
     void execute() const;
     void execute(const QStringList& args) const;
     void removeFiles();
     void removeLinkFile();
 
     void setName( const QString& docname );
     void setExec( const QString& exec );
     void setFile( const QString& filename );
     void setLinkFile( const QString& filename );
     void setComment( const QString& comment );
     void setType( const QString& mimetype );
     inline void setRotation ( const QString &rot ) { mRotation = rot; } // inline for BC 
     void setIcon( const QString& iconname );
     void setCategories( const QArray<int> &v );
     bool writeLink() const;
 
     void setProperty(const QString& key, const QString& value);
     QString property(const QString& key) const;
 
 #ifdef QTOPIA_INTERNAL_PRELOADACCESS
     bool isPreloaded() const;
     void setPreloaded(bool yesNo);
 #endif
 
-#ifdef QTOPIA_INTERNAL_APPLNKASSIGN
     AppLnk &operator=(const AppLnk &other);
-#endif
 
 protected:
     QString mName;
 
     /* remove for Qtopia 3.0 -zecke */
     QPixmap mPixmap;
 
     /* remove for Qtopia 3.0 -zecke */
     QPixmap mBigPixmap;
 
     QString mExec;
     QString mType;
     QString mRotation;
     QString mComment;
     QString mFile;
     QString mLinkFile;
     QString mIconFile;
     QStringList mMimeTypes;
     QStringList mMimeTypeIcons;
     int mId;
     static int lastId;
     AppLnkPrivate *d;
     friend class AppLnkSet;