on the way to compile

src/qbrowserlib/buttonlineedit.hxx

@@ -9,10 +9,10 @@
 #define __BUTTONLINEEDIT_HXX__
 
 #include <qbrowserlib/log.hxx>
-#include <QtGui/QLineEdit>
-#include <QtGui/QToolButton>
-#include <QtGui/QAction>
-#include <QtGui/QStyle>
+#include <QLineEdit>
+#include <QToolButton>
+#include <QAction>
+#include <QStyle>
 #include <QtCore/QDebug>
 
 //! @addtogroup qbrowserlib

src/qbrowserlib/errorlog.hxx

@@ -9,8 +9,8 @@
 #define ERRORLOG_HXX
 
 #include <qbrowserlib/log.hxx>
-#include <qbrowserlib/ui_errorlog.h>
-#include <QtGui/QDialog>
+#include <qbrowserlib/ui_errorlog.hxx>
+#include <QDialog>
 
 //! @addtogroup qbrowserlib
 //! @{

src/qbrowserlib/log.hxx

@@ -8,10 +8,8 @@
 #ifndef QBROWSERLIB_LOG
 #define QBROWSERLIB_LOG
 
-#ifdef QT_GUI_LIB
-#include <qbrowserlib/ui_log.h>
-#include <QtGui/QDialog>
-#endif
+#include <qbrowserlib/ui_log.hxx>
+#include <QDialog>
 
 #include <stdexcept>
 #include <sstream>
@@ -122,23 +120,15 @@ namespace qbrowserlib {
       bool _clean;
   };
 
-  class LogDialog:
-#ifdef QT_GUI_LIB
-      public QDialog, public Ui::LogDialog
-#else
-      public QObject
-#endif
-  {
+  class LogDialog: public QDialog, public Ui::LogDialog {
 
       Q_OBJECT;
           
     public:
           
-#ifdef QT_GUI_LIB
       LogDialog(QWidget* p=0): QDialog(p) {
         setupUi(this);
       }
-#endif
           
       template<typename TYPE> LogDialog& append(const Log& log, TYPE* arg) {
         std::ostringstream ss;
@@ -147,7 +137,6 @@ namespace qbrowserlib {
       }
       
       template<typename TYPE> LogDialog& append(const Log& log, TYPE arg) {
-#ifdef QT_GUI_LIB
         int pos(_logs->rowCount());
         _logs->insertRow(pos);
         _logs->setItem
@@ -165,13 +154,11 @@ namespace qbrowserlib {
         _logs->setItem
           (pos, MESSAGE,
            new QTableWidgetItem(QVariant(arg).toString()));
-#endif
         return *this;
       }
 
     protected Q_SLOTS:
 
-#ifdef QT_GUI_LIB
       void on__fileLine_toggled(bool checked) {
         if (checked) {
           _logs->showColumn(FILE);
@@ -218,13 +205,12 @@ namespace qbrowserlib {
         if (!items.isEmpty()) _logs->scrollToItem(items[0]);
         unsetCursor();
       }
-#endif
          
     private:
 
       friend class Log;
       enum {FILE, LINE, INSTANCE, FUNCTION, MESSAGE} Columns;
-          
+      
   };
 
   // note: template class method must be defined in the header

src/qbrowserlib/makefile.am

@@ -5,14 +5,18 @@
 
 qbrowserlibdir=${includedir}/qbrowserlib
 
-qbrowserlib_HEADERS = buttonlineedit.hxx errorlog.hxx log.hxx		\
-                      settings.hxx swisswebwidget.hxx certs.hxx		\
-                      executor.hxx pluginfactory.hxx swisswebpage.hxx	\
-                      temporaryfile.hxx downloadmanager.hxx		\
-                      filestorage.hxx saveorrun.hxx swisswebview.hxx
+qbrowserlib_HEADERS = $(libqbrowserlib_la_HEADERS)
 
 lib_LTLIBRARIES = libqbrowserlib.la
 
-libqbrowserlib_la_SOURCES = errorlog.ui log.ui saveorrun.ui		\
-                            settings.ui swisswebwidget.ui certs.cxx	\
-                            log.cxx
+libqbrowserlib_la_MOCFILES = buttonlineedit.hxx errorlog.hxx log.hxx	\
+                             settings.hxx swisswebwidget.hxx		\
+                             certs.hxx executor.hxx pluginfactory.hxx	\
+                             swisswebpage.hxx temporaryfile.hxx		\
+                             downloadmanager.hxx filestorage.hxx	\
+                             saveorrun.hxx swisswebview.hxx
+libqbrowserlib_la_UIFILES = errorlog.ui log.ui saveorrun.ui	\
+                            settings.ui swisswebwidget.ui
+libqbrowserlib_la_SOURCES = certs.cxx log.cxx					\
+                            $(libqbrowserlib_la_MOCFILES:%.hxx=moc_%.hxx)	\
+                            $(libqbrowserlib_la_UIFILES:%.ui=ui_%.hxx)

src/qbrowserlib/saveorrun.hxx

@@ -9,17 +9,17 @@
 #define __SAVEORRUN_HXX__
 
 #include <qbrowserlib/log.hxx>
-#include <qbrowserlib/ui_saveorrun.h>
+#include <qbrowserlib/ui_saveorrun.hxx>
 #include <qbrowserlib/executor.hxx>
 
 #include <QtCore/QUrl>
 #include <QtNetwork/QNetworkReply>
-#include <QtGui/QDialog>
-#include <QtGui/QFileDialog>
-#include <QtGui/QFileSystemModel>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QMessageBox>
-#include <QtGui/QDesktopServices>
+#include <QDialog>
+#include <QFileDialog>
+#include <QFileSystemModel>
+#include <QDialogButtonBox>
+#include <QMessageBox>
+#include <QDesktopServices>
 #include <memory>
 
 #include <cassert>

src/qbrowserlib/settings.hxx

@@ -9,13 +9,13 @@
 #define QBROWSERLIB_SETTINGS_HXX
 
 #include <qbrowserlib/log.hxx>
-#include <qbrowserlib/ui_settings.h>
+#include <qbrowserlib/ui_settings.hxx>
 
 #include <QtWebKit/QWebSettings>
 #include <QtCore/QSettings>
 #include <QtCore/QMap>
 #include <QtCore/QList>
-#include <QtGui/QLineEdit>
+#include <QLineEdit>
 
 #include <cassert>
 

src/qbrowserlib/swisswebwidget.hxx

@@ -8,13 +8,13 @@
 #ifndef __SWISSWEBWIDGET_HXX__
 #define __SWISSWEBWIDGET_HXX__
 
-#include <qbrowserlib/ui_swisswebwidget.h>
+#include <qbrowserlib/ui_swisswebwidget.hxx>
 #include <qbrowserlib/downloadmanager.hxx>
 #include <qbrowserlib/errorlog.hxx>
 
-#include <QtGui/QMainWindow>
-#include <QtGui/QToolBar>
-#include <QtGui/QStatusBar>
+#include <QMainWindow>
+#include <QToolBar>
+#include <QStatusBar>
 
 #include <QtDebug>