From e8741e9e0bbf84d6995b2571fb9b0b00daba5548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Thu, 10 May 2012 13:59:12 +0000
Subject: [PATCH] now again does not work anymore WHY??? + trace filename; refs
 #130

---
 src/browser.hxx                 | 4 ++--
 src/main.cxx                    | 7 ++++---
 src/qbrowserlib/filestorage.hxx | 5 +++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/browser.hxx b/src/browser.hxx
index 69a76f0..8a94ccf 100644
--- a/src/browser.hxx
+++ b/src/browser.hxx
@@ -881,7 +881,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
       urls.removeAll("");
       urls.removeDuplicates();
       if (_bookmarkfile.writeable()) {
-        LOG<<"write to bookmark file";
+        LOG<<"write to bookmark file"<<_bookmarkfile.name();
         _bookmarkfile.write(urls);
       } else if (_settings()) {
         LOG<<"write to settings";
@@ -911,7 +911,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
       TRC; LOG<<"Loading Bookmarks ...";
       QStringList urls;
       if (_bookmarkfile.readable()) {
-        LOG<<"load from file";
+        LOG<<"load from file"<<_bookmarkfile.name();
         urls = _bookmarkfile.read();
       } else if (_settings()) {
         LOG<<"load from settings";
diff --git a/src/main.cxx b/src/main.cxx
index 1b48931..e50b651 100644
--- a/src/main.cxx
+++ b/src/main.cxx
@@ -248,14 +248,15 @@ int main(int argv, char** argc) try {
      <<"Hostname"<<QNetworkProxy::applicationProxy().hostName()
      <<"Port"<<QNetworkProxy::applicationProxy().port();
   //............................................................................
-  LOG<<"LIBRARY PATHES:\n"<<app.libraryPaths().join("\n").toStdString();
+  std::cout<<"LIBRARY PATHES:\n"<<app.libraryPaths().join("\n").toStdString()<<std::endl;
   if (env().contains("QT_PLUGIN_PATH")) {
     foreach (QString path, env()["QT_PLUGIN_PATH"].split(":")) {
-      LOG<<"**** Setting: PLUGIN-PATH to "<<path.toStdString();
+      std::cout<<"**** Setting: PLUGIN-PATH to "<<path.toStdString()<<std::endl;
       app.addLibraryPath(path);
     }
   } else {
-    LOG<<"**** PLUGIN-PATH is not defined";
+    std::cout<<"**** PLUGIN-PATH is not defined"<<std::endl;
+    abort();
   }
   if (env().contains("QTWEBKIT_PLUGIN_PATH"))
     qt_drt_overwritePluginDirectories();
diff --git a/src/qbrowserlib/filestorage.hxx b/src/qbrowserlib/filestorage.hxx
index f4a93be..023b822 100644
--- a/src/qbrowserlib/filestorage.hxx
+++ b/src/qbrowserlib/filestorage.hxx
@@ -31,6 +31,8 @@ class Storage: public QObject {
     operator bool() {
       return valid();
     }
+    /*! @return name of the storage, e.g. filename */
+    virtual QString name() = 0;
     /*! @return true if storage object already exists */
     virtual bool readable() = 0;
     /*! @return true if storage object exists or could be created */
@@ -53,6 +55,9 @@ class FileStorage: public Storage {
       assert(connect(&_watcher, SIGNAL(fileChanged(const QString&)),
                      SIGNAL(changed())));
     }
+    QString name() {
+      return _file.fileName();
+    }
     bool readable() {
       return QFileInfo(_file).exists();
     }