SVN_SILENT: minor coding style fixes

[dolphin.git] / src / statusbarmessagelabel.h

diff --git a/src/statusbarmessagelabel.h b/src/statusbarmessagelabel.h
index 9f7c7a4a6c6c8d6ef57fc1b140e060082f36aff0..264a3538de657f8a7e6b48db77778e7365d671b7 100644 (file)
--- a/src/statusbarmessagelabel.h
+++ b/src/statusbarmessagelabel.h
@@ -23,10 +23,10 @@
 
 #include <dolphinstatusbar.h>
 
-#include <QList>
-#include <QPixmap>
-#include <QString>
-#include <QWidget>
+#include <QtCore/QList>
+#include <QtGui/QPixmap>
+
+#include <QtGui/QWidget>
 
 class QPaintEvent;
 class QResizeEvent;
@@ -51,15 +51,16 @@ public:
 
     void setMessage(const QString& text, DolphinStatusBar::Type type);
 
-    DolphinStatusBar::Type type() const { return m_type; }
-    const QString& text() const { return m_text; }
+    DolphinStatusBar::Type type() const;
+
+    const QString& text() const;
 
-    void setDefaultText(const QString& text) { m_defaultText = text; }
-    const QString& defaultText() const { return m_defaultText; }
+    void setDefaultText(const QString& text);
+    const QString& defaultText() const;
 
     // TODO: maybe a better approach is possible with the size hint
     void setMinimumTextHeight(int min);
-    int minimumTextHeight() const { return m_minTextHeight; }
+    int minimumTextHeight() const;
 
     /**
      * Returns the gap of the width of the current set text to the
@@ -116,7 +117,8 @@ private:
     void reset();
 
 private:
-    enum State {
+    enum State
+    {
         Default,
         Illuminate,
         Illuminated,
@@ -124,6 +126,7 @@ private:
     };
 
     enum { GeometryTimeout = 100 };
+    enum { BorderGap = 2 };
 
     DolphinStatusBar::Type m_type;
     State m_state;
@@ -135,12 +138,31 @@ private:
     QList<QString> m_pendingMessages;
     QPixmap m_pixmap;
     QPushButton* m_closeButton;
+};
 
-    QColor mixColors(const QColor& c1,
-                     const QColor& c2,
-                     int percent) const;
+inline DolphinStatusBar::Type StatusBarMessageLabel::type() const
+{
+    return m_type;
+}
 
-    int borderGap() const { return 2; }
-};
+inline const QString& StatusBarMessageLabel::text() const
+{
+    return m_text;
+}
+
+inline void StatusBarMessageLabel::setDefaultText(const QString& text)
+{
+    m_defaultText = text;
+}
+
+inline const QString& StatusBarMessageLabel::defaultText() const
+{
+    return m_defaultText;
+}
+
+inline int StatusBarMessageLabel::minimumTextHeight() const
+{
+    return m_minTextHeight;
+}
 
 #endif