on the way to compile

2015-03-14 16:26:54 +00:00
parent 7cd3999fcc
commit 823aed41d9
21 changed files with 140 additions and 121 deletions
--- a/src/authentication.hxx
+++ b/src/authentication.hxx
@@ -8,8 +8,8 @@
 #ifndef __AUTHENTICATION_HXX__
 #define __AUTHENTICATION_HXX__

-#include <ui_authentication.h>
-#include <QtGui/QDialog>
+#include <ui_authentication.hxx>
+#include <QDialog>
 #include <QtNetwork/QAuthenticator>

 class Authentication: public QDialog, protected Ui::Authentication {
--- a/src/browser.hxx
+++ b/src/browser.hxx
@@ -24,7 +24,7 @@
 #include <proxyface/proxy.hxx>
 #include <sslclientnetworkmanager.hxx>

-#include <ui_browser.h>
+#include <ui_browser.hxx>

 #include <qbrowserlib/buttonlineedit.hxx>
 #include <qbrowserlib/filestorage.hxx>
@@ -32,23 +32,23 @@
 #include <qbrowserlib/settings.hxx>
 #include <qbrowserlib/executor.hxx>

-#include <QtGui/QMainWindow>
-#include <QtGui/QProgressBar>
-#include <QtGui/QComboBox>
-#include <QtGui/QSlider>
-#include <QtGui/QMessageBox>
-#include <QtGui/QPrinter>
-#include <QtGui/QPrintDialog>
-#include <QtGui/QPrintPreviewDialog>
+#include <QMainWindow>
+#include <QProgressBar>
+#include <QComboBox>
+#include <QSlider>
+#include <QMessageBox>
+#include <QPrinter>
+#include <QPrintDialog>
+#include <QPrintPreviewDialog>
 #include <QtWebKit/QWebFrame>
 #include <QtWebKit/QWebHistory>
 #include <QtNetwork/QNetworkReply>
 #include <QtNetwork/QSslError>
 #include <QtNetwork/QNetworkProxy>
 #include <QtCore/QDir>
-#include <QtGui/QFileDialog>
+#include <QFileDialog>

-#include <QtGui/QDesktopServices>
+#include <QDesktopServices>

 #include <stdexcept>
 #include <cassert>
--- a/src/certificate.hxx
+++ b/src/certificate.hxx
@@ -8,10 +8,10 @@
 #ifndef CERTIFICATE_HXX
 #define CERTIFICATE_HXX

-#include <ui_certificate.h>
+#include <ui_certificate.hxx>
 #include <QtCore/QDateTime>
-#include <QtGui/QTreeWidget>
-#include <QtGui/QTreeWidgetItem>
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
 #include <QtNetwork/QSslCertificate>

 #include <QtCore/QDebug>
--- a/src/editbookmarks.hxx
+++ b/src/editbookmarks.hxx
@@ -8,10 +8,10 @@
 #ifndef __EDITBOOKMARKS_HXX__
 #define __EDITBOOKMARKS_HXX__

-#include <QtGui/QDialog>
-#include <QtGui/QComboBox>
-#include <QtGui/QLineEdit>
-#include <ui_editbookmarks.h>
+#include <QDialog>
+#include <QComboBox>
+#include <QLineEdit>
+#include <ui_editbookmarks.hxx>

 #include <QDebug>

--- a/src/logincertificate.hxx
+++ b/src/logincertificate.hxx
@@ -9,7 +9,7 @@
 #define LOGINCERTIFICATE_HXX

 #include <qbrowserlib/log.hxx>
-#include <ui_logincertificate.h>
+#include <ui_logincertificate.hxx>

 class LoginCertificate: public QDialog, protected Ui::LoginCertificate {
  public:
--- a/src/main.cxx
+++ b/src/main.cxx
@@ -11,7 +11,7 @@
 #include <qbrowserlib/log.hxx>
 #include <browser.hxx>

-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QtCore/QTranslator>
 #include <QtCore/QTextCodec>
 #include <QtCore/QLocale>
--- a/src/pinentry.hxx
+++ b/src/pinentry.hxx
@@ -10,8 +10,8 @@

 #include <cryptoki.hxx>
 #include <qbrowserlib/log.hxx>
-#include <ui_pinentry.h>
-#include <QtGui/QDialog>
+#include <ui_pinentry.hxx>
+#include <QDialog>
 #include <QtCore/QDateTime>
 #include <QtNetwork/QSslCertificate>

--- a/src/qbrowserlib/buttonlineedit.hxx
+++ b/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
--- a/src/qbrowserlib/errorlog.hxx
+++ b/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
 //! @{
--- a/src/qbrowserlib/log.hxx
+++ b/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
--- a/src/qbrowserlib/makefile.am
+++ b/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)
--- a/src/qbrowserlib/saveorrun.hxx
+++ b/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>
--- a/src/qbrowserlib/settings.hxx
+++ b/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>

--- a/src/qbrowserlib/swisswebwidget.hxx
+++ b/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>

--- a/src/smartcardauth.hxx
+++ b/src/smartcardauth.hxx
@@ -8,7 +8,7 @@
 #include <QtNetwork/QSslConfiguration>
 #include <QtNetwork/QSslCertificate>
 #include <QtNetwork/QSslKey>
-#include <QtGui/QMessageBox>
+#include <QMessageBox>

 #include <pinentry.hxx>

--- a/src/swisssurfer.pc.in
+++ b/src/swisssurfer.pc.in
@@ -1,18 +1,18 @@
 ## @id $Id$
 #
-# This file has been added by bootstrap.sh on Fri, 13 Mar 2015 15:22:56 +0100
+# This file has been added by bootstrap.sh on Sat, 14 Mar 2015 15:34:48 +0100
 # Feel free to change it or even remove and rebuild it, up to your needs
 #
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890

-prefix=@PACKAGE_NAME@
-exec_prefix=
+prefix=@prefix@
+exec_prefix=@exec_prefix@
 libdir=/lib
 includedir=/include

 Name: @PACKAGE_NAME@
 Description: @DESCRIPTION@
 Version: @VERSION@
-Libs: -L -l@PACKAGE_NAME@
-Cflags: -I 
+Libs: -L -l@PACKAGE_NAME@ @LDFLAGS@
+Cflags: -I @CPPFLAGS@