changes for new libpcscxx, works, but crashes at the end; refs #176

src/qbrowserlib/certs.hxx

@@ -60,7 +60,7 @@ namespace qbrowserlib {
       
     private:
       
-      cryptoki::Init _cryptoki;
+      cryptoki::Library _cryptoki;
       
   };
   

src/qbrowserlib/executor.hxx

@@ -24,7 +24,7 @@ namespace qbrowserlib {
       
       Q_OBJECT;
 
-    signals:
+    Q_SIGNALS:
 
       void applicationStarted();
       void applicationFinished();

src/qbrowserlib/log.hxx

@@ -54,7 +54,7 @@ namespace qbrowserlib {
   qbrowserlib::Log(0, __PRETTY_FUNCTION__, __FILE__, __LINE__, false)<<X
   
 #define OPENSSL_CHECK(X)                                                \
-  if (!X) {                                                             \
+  if (!(X)) {                                                           \
     ERR_load_ENGINE_strings();                                          \
     std::stringstream ss;                                               \
     for (unsigned int err(0); err=ERR_get_error();) {                   \
@@ -68,7 +68,11 @@ namespace qbrowserlib {
   }
 
   class LogDialog;
-      
+
+  #ifdef DEBUG
+  #undef DEBUG
+  #endif
+  
   class Log {
       
     public:
@@ -198,8 +202,9 @@ namespace qbrowserlib {
                             Qt::MatchWrap|Qt::MatchContains
                             |Qt::MatchFixedString));
         _logs->clearSelection();
-        foreach (QTableWidgetItem* item, items) {
-          item->setSelected(true);
+        for(QList<QTableWidgetItem*>::iterator item(items.begin());
+            item!=items.end(); ++item) {
+          (*item)->setSelected(true);
         }
         if (!items.isEmpty()) _logs->scrollToItem(items[0]);
         unsetCursor();

src/qbrowserlib/pluginfactory.hxx

@@ -21,7 +21,7 @@ namespace qbrowserlib {
   /*! */
   class PluginFactory: public QWebPluginFactory {
       Q_OBJECT;
-    signals:
+    Q_SIGNALS:
       void done();
     public:
       PluginFactory(QNetworkAccessManager* net, QObject* p=0):

src/qbrowserlib/qmake.pro.in

@@ -1,4 +1,5 @@
 QT += webkit network gui
+CONFIG += no_keywords
 QMAKE_LIBS += -lproxyface -lpcscxx -lssl -lcrypto
 QMAKE_CXXFLAGS += -Wno-parentheses -Wno-unused-parameter
 #-std=c++0x
@@ -62,3 +63,4 @@ DEFINES += VERSION=\'\"@VERSION@\"\' BUILDDATE=\'\"@BUILDDATE@\"\'
 ## DEBUG
 # QMAKE_CXXFLAGS += -include iostream -D\"CRYPTOKI_LOG(X)=std::clog<<\\\"CRYPTOKI_\\\"<<X<<\\\"_@_\\\"<<__PRETTY_FUNCTION__<<std::endl\" -D\"PCSC_LOG(X)=std::clog<<\\\"PCSC_\\\"<<X<<\\\"_@_\\\"<<__PRETTY_FUNCTION__<<std::endl\" -D\"OPENSSL_LOG(X)=std::clog<<\\\"OPENSSL_\\\"<<X<<\\\"_@_\\\"<<__PRETTY_FUNCTION__<<std::endl'" @CPPFLAGS@ @CXXFLAGS@ 
 QMAKE_CXXFLAGS += @CPPFLAGS@ @CXXFLAGS@
+QMAKE_LFLAGS += @LDFLAGS@

src/qbrowserlib/saveorrun.hxx

@@ -33,7 +33,7 @@ namespace qbrowserlib {
   class SaveOrRun: public QWidget, public Ui::SaveOrRun {
       Q_OBJECT;
 
-    signals:
+    Q_SIGNALS:
 
       void accept();
 

src/qbrowserlib/swisswebpage.hxx

@@ -31,7 +31,7 @@ namespace qbrowserlib {
       - Set useragent from environment variable @c SWISS_USERAGENT */
   class SwissWebPage: public QWebPage {
       Q_OBJECT;
-    signals:
+    Q_SIGNALS:
       void newPage(SwissWebPage*);
     public:
       SwissWebPage(QNetworkAccessManager* net, QObject *parent = 0):

src/qbrowserlib/swisswebview.hxx

@@ -29,7 +29,7 @@ namespace qbrowserlib {
       */ 
   class SwissWebView: public QWebView {
       Q_OBJECT;
-    signals:
+    Q_SIGNALS:
       //! Signals that a new window (or tab) must be opened
       /*! @note You @b must connect to @ref newView and assign the new
           @ref SwissWebView instance to a partent widget or at least
@@ -62,7 +62,7 @@ namespace qbrowserlib {
         assert(connect(page(), SIGNAL(newPage(SwissWebPage*)),
                        SLOT(newPage(SwissWebPage*))));
       }
-    private slots:
+    private Q_SLOTS:
       void newPage(SwissWebPage* p) {
         // memory will be lost if signal is not handled and SwissWebView
         // is not assigned