move topbar to libtomahawk

src/CMakeLists.txt

@@ -50,12 +50,6 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui}
      sourcetree/sourcetreeitemwidget.cpp
      sourcetree/sourcetreeview.cpp
 
-     topbar/topbar.cpp
-     topbar/clearbutton.cpp  
-     topbar/searchlineedit.cpp  
-     topbar/lineedit.cpp
-     topbar/searchbutton.cpp
-
      transferview.cpp
      tomahawktrayicon.cpp
      audiocontrols.cpp
@@ -86,13 +80,6 @@ SET( tomahawkHeadersGui ${tomahawkHeadersGui}
      sourcetree/sourcetreeitemwidget.h
      sourcetree/sourcetreeview.h
 
-     topbar/topbar.h
-     topbar/clearbutton.h 
-     topbar/searchlineedit.h 
-     topbar/lineedit.h
-     topbar/lineedit_p.h
-     topbar/searchbutton.h
-
      transferview.h
      tomahawktrayicon.h
      audiocontrols.h
@@ -107,7 +94,6 @@ SET( tomahawkUI ${tomahawkUI}
 
      audiocontrols.ui
      sourcetree/sourcetreeitemwidget.ui
-     topbar/topbar.ui
 )
 
 INCLUDE_DIRECTORIES(

src/libtomahawk/CMakeLists.txt

@@ -90,6 +90,11 @@ set( libSources
     playlist/albumproxymodel.cpp
     playlist/albumitemdelegate.cpp
     playlist/albumview.cpp
+    playlist/topbar/topbar.cpp
+    playlist/topbar/clearbutton.cpp  
+    playlist/topbar/searchlineedit.cpp  
+    playlist/topbar/lineedit.cpp
+    playlist/topbar/searchbutton.cpp
 
     playlist/dynamic/DynamicPlaylist.cpp
     playlist/dynamic/DynamicControl.cpp
@@ -223,6 +228,12 @@ set( libHeaders
     playlist/albumproxymodel.h
     playlist/albumitemdelegate.h
     playlist/albumview.h
+    playlist/topbar/topbar.h
+    playlist/topbar/clearbutton.h
+    playlist/topbar/searchlineedit.h  
+    playlist/topbar/lineedit.h
+    playlist/topbar/lineedit_p.h
+    playlist/topbar/searchbutton.h
 
     playlist/dynamic/DynamicPlaylist.h
     playlist/dynamic/DynamicControl.h
@@ -257,6 +268,7 @@ set( libUI ${libUI}
     widgets/newplaylistwidget.ui
     widgets/welcomewidget.ui
     widgets/infowidgets/sourceinfowidget.ui
+    playlist/topbar/topbar.ui
 )
 
 include_directories( . ${CMAKE_CURRENT_BINARY_DIR} .. 

src/libtomahawk/playlist/topbar/lineedit.h

@@ -29,8 +29,9 @@
 #ifndef LINEEDIT_H
 #define LINEEDIT_H
 
-#include <qlineedit.h>
+#include <QLineEdit>
 
+#include "dllmacro.h"
 class QHBoxLayout;
 
 /*
@@ -44,7 +45,7 @@ class QHBoxLayout;
     into the center of the widget.
 */
 class SideWidget;
-class LineEdit : public QLineEdit
+class DLLEXPORT LineEdit : public QLineEdit
 {
     Q_OBJECT
     Q_PROPERTY(QString inactiveText READ inactiveText WRITE setInactiveText)

src/libtomahawk/playlist/topbar/searchbutton.h

@@ -22,8 +22,10 @@
 
 #include <qabstractbutton.h>
 
+#include "dllmacro.h"
+
 class QCompleter;
-class SearchButton : public QAbstractButton
+class DLLEXPORT SearchButton : public QAbstractButton
 {
     Q_OBJECT
 

src/libtomahawk/playlist/topbar/topbar.h

@@ -12,7 +12,7 @@ namespace Ui
     class TopBar;
 }
 
-class TopBar : public QWidget
+class DLLEXPORT TopBar : public QWidget
 {
 Q_OBJECT