Commit 319677bd authored by Scott Wheeler's avatar Scott Wheeler

Cleaned up inlines to make GCC 3 happy.

svn path=/trunk/kdemultimedia/juk/; revision=191463
parent cd98b8a7
...@@ -58,7 +58,7 @@ public: ...@@ -58,7 +58,7 @@ public:
/** /**
* Checks to see if the cache for this item is up to date. * Checks to see if the cache for this item is up to date.
*/ */
inline bool current() const; bool current() const;
QDataStream &read(QDataStream &s); QDataStream &read(QDataStream &s);
private: private:
......
...@@ -42,7 +42,6 @@ Tag *PlaylistItem::tag() const ...@@ -42,7 +42,6 @@ Tag *PlaylistItem::tag() const
} }
// QFileInfo-ish methods // QFileInfo-ish methods
QString PlaylistItem::fileName() const { return(data->fileName()); } QString PlaylistItem::fileName() const { return(data->fileName()); }
QString PlaylistItem::filePath() const { return(data->filePath()); } QString PlaylistItem::filePath() const { return(data->filePath()); }
QString PlaylistItem::absFilePath() const { return(data->absFilePath()); } QString PlaylistItem::absFilePath() const { return(data->absFilePath()); }
......
...@@ -51,12 +51,11 @@ public: ...@@ -51,12 +51,11 @@ public:
// These are just forwarding methods to PlaylistItem::Data, a QFileInfo // These are just forwarding methods to PlaylistItem::Data, a QFileInfo
// subclass. // subclass.
QString fileName() const;
inline QString fileName() const; QString filePath() const;
inline QString filePath() const; QString absFilePath() const;
inline QString absFilePath() const; QString dirPath(bool absPath = false) const;
inline QString dirPath(bool absPath = false) const; bool isWritable() const;
inline bool isWritable() const;
public slots: public slots:
/** /**
......
...@@ -53,26 +53,6 @@ Tag::~Tag() ...@@ -53,26 +53,6 @@ Tag::~Tag()
Cache::instance()->remove(absFilePath()); Cache::instance()->remove(absFilePath());
} }
QString Tag::absFilePath() const
{
return(info.absFilePath());
}
QDateTime Tag::lastModified() const
{
return(info.lastModified());
}
bool Tag::fileExists() const
{
return(info.exists() && info.isFile());
}
QFileInfo Tag::fileInfo() const
{
return(info);
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// protected methods // protected methods
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
......
...@@ -75,10 +75,10 @@ public: ...@@ -75,10 +75,10 @@ public:
// These functions are inlined because they are used on startup -- the most // These functions are inlined because they are used on startup -- the most
// performance critical section of JuK. // performance critical section of JuK.
inline QString absFilePath() const; inline QString absFilePath() const { return(info.absFilePath()); }
inline QDateTime lastModified() const; inline QDateTime lastModified() const { return(info.lastModified()); }
inline bool fileExists() const; inline bool fileExists() const { return(info.exists() && info.isFile()); }
inline QFileInfo fileInfo() const; inline QFileInfo fileInfo() const { return(info); }
protected: protected:
/** /**
...@@ -89,9 +89,9 @@ protected: ...@@ -89,9 +89,9 @@ protected:
*/ */
Tag(const QString &file); Tag(const QString &file);
static inline QString readBitrate(const KFileMetaInfo &metaInfo); static QString readBitrate(const KFileMetaInfo &metaInfo);
static inline QString readLength(const KFileMetaInfo &metaInfo); static QString readLength(const KFileMetaInfo &metaInfo);
static inline int readSeconds(const KFileMetaInfo &metaInfo); static int readSeconds(const KFileMetaInfo &metaInfo);
private: private:
QFileInfo info; QFileInfo info;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment