[Cleanup] Split src/lib/webview into tabwidget, webkit and webtab folders

src/lib/3rdparty/qftp/qftp.pri

@@ -1,2 +1,4 @@
 HEADERS += $$PWD/qftp.h $$PWD/qurlinfo.h
 SOURCES += $$PWD/qftp.cpp $$PWD/qurlinfo.cpp
+INCLUDEPATH += $$PWD
+DEPENDPATH += $$PWD

src/lib/app/browserwindow.cpp

@@ -50,7 +50,7 @@
 #include "browsinglibrary.h"
 #include "navigationbar.h"
 #include "pagescreen.h"
-#include "webinspectordockwidget.h"
+#include "webinspector.h"
 #include "bookmarksimport/bookmarksimportdialog.h"
 #include "qztools.h"
 #include "actioncopy.h"

src/lib/lib.pro

@@ -10,525 +10,504 @@ TEMPLATE = lib
 DEFINES *= QUPZILLA_SHAREDLIBRARY
 
 include(../defines.pri)
-include(3rdparty/qtsingleapplication.pri)
 include(../../translations/translations.pri)
+include(3rdparty/qtsingleapplication/qtsingleapplication.pri)
 include(plugins/qtwebkit/qtwebkit-plugins.pri)
 
 CONFIG(debug, debug|release): include(../../tests/modeltest/modeltest.pri)
 
 unix:!contains(DEFINES, "DISABLE_DBUS") QT += dbus
 
-INCLUDEPATH += 3rdparty\
+INCLUDEPATH += 3rdparty \
-               app\
+               adblock \
-               autofill\
+               app \
-               bookmarks\
+               autofill \
-               cookies\
+               bookmarks \
-               session\
+               cookies \
-               downloads\
+               downloads \
-               history\
+               history \
-               navigation\
+               navigation \
-               network\
+               network \
-               other\
+               notifications \
-               preferences\
+               opensearch \
-               rss\
+               other \
-               tools\
+               plugins \
-               utils\
+               popupwindow \
-               webview\
+               preferences \
-               plugins\
+               rss \
-               sidebar\
+               session \
-               data\
+               sidebar \
-               adblock\
+               tabwidget \
-               desktopnotifications\
+               tools \
-               opensearch\
+               webkit \
-               popupwindow\
+               webtab \
 
-DEPENDPATH += 3rdparty\
+DEPENDPATH += $$INCLUDEPATH \
-              app\
+              data \
-              autofill\
-              bookmarks\
-              cookies\
-              session\
-              downloads\
-              history\
-              navigation\
-              network\
-              other\
-              preferences\
-              rss\
-              tools\
-              utils\
-              webview\
-              plugins\
-              sidebar\
-              data\
-              adblock\
-              desktopnotifications\
-              opensearch\
-              popupwindow\
 
 SOURCES += \
-    webview/tabpreview.cpp \
-    3rdparty/qtwin.cpp \
-    3rdparty/lineedit.cpp \
-    app/mainapplication.cpp \
-    app/autosaver.cpp \
-    preferences/autofillmanager.cpp \
-    bookmarks/bookmarkstoolbar.cpp \
-    bookmarks/bookmarksmanager.cpp \
-    cookies/cookiemanager.cpp \
-    cookies/cookiejar.cpp \
-    downloads/downloadmanager.cpp \
-    history/historymanager.cpp \
-    navigation/websearchbar.cpp \
-    navigation/locationbar.cpp \
-    navigation/locationbarpopup.cpp \
-    network/networkmanagerproxy.cpp \
-    network/networkmanager.cpp \
-    other/updater.cpp \
-    other/sourceviewer.cpp \
-    preferences/preferences.cpp \
-    rss/rssmanager.cpp \
-    other/clearprivatedata.cpp \
-    webview/webpage.cpp \
-    webview/tabwidget.cpp \
-    webview/tabbar.cpp \
-    webview/siteinfo.cpp \
-    webview/searchtoolbar.cpp \
-    app/commandlineoptions.cpp \
-    other/aboutdialog.cpp \
-    plugins/plugins.cpp \
-    plugins/pluginproxy.cpp \
-    tools/clickablelabel.cpp \
-    downloads/downloadoptionsdialog.cpp \
-    tools/treewidget.cpp \
-    bookmarks/bookmarkswidget.cpp \
-    tools/frame.cpp \
-    sidebar/sidebar.cpp \
-    webview/siteinfowidget.cpp \
-    plugins/clicktoflash.cpp \
-    plugins/webpluginfactory.cpp \
-    downloads/downloaditem.cpp \
     3rdparty/ecwin7.cpp \
-    webview/webtab.cpp \
-    rss/rsswidget.cpp \
-    autofill/autofillnotification.cpp \
-    rss/rssnotification.cpp \
-    preferences/sslmanager.cpp \
-    preferences/jsoptions.cpp \
-    tools/animatedwidget.cpp \
-    tools/htmlhighlighter.cpp \
-    tools/colors.cpp \
-    other/sourceviewersearch.cpp \
-    adblock/adblocksubscription.cpp \
-    adblock/adblockrule.cpp \
-    adblock/adblockmanager.cpp \
-    adblock/adblockdialog.cpp \
-    adblock/adblockblockednetworkreply.cpp \
-    adblock/adblockicon.cpp \
-    tools/docktitlebarwidget.cpp \
-    sidebar/bookmarkssidebar.cpp \
-    sidebar/historysidebar.cpp \
-    desktopnotifications/desktopnotification.cpp \
-    desktopnotifications/desktopnotificationsfactory.cpp \
-    tools/progressbar.cpp \
-    tools/iconprovider.cpp \
-    network/networkproxyfactory.cpp \
-    tools/closedtabsmanager.cpp \
-    other/statusbarmessage.cpp \
-    tools/buttonbox.cpp \
-    tools/widget.cpp \
-    3rdparty/squeezelabelv2.cpp \
-    3rdparty/squeezelabelv1.cpp \
-    tools/buttonwithmenu.cpp \
-    other/browsinglibrary.cpp \
-    3rdparty/stylehelper.cpp \
     3rdparty/fancytabwidget.cpp \
-    history/webhistoryinterface.cpp \
+    3rdparty/lineedit.cpp \
-    tools/toolbutton.cpp \
+    3rdparty/processinfo.cpp \
-    navigation/navigationbar.cpp \
+    3rdparty/qtwin.cpp \
-    navigation/reloadstopbutton.cpp \
+    3rdparty/squeezelabelv1.cpp \
-    preferences/thememanager.cpp \
+    3rdparty/squeezelabelv2.cpp \
-    tools/qztools.cpp \
+    3rdparty/stylehelper.cpp \
-    other/pagescreen.cpp \
+    adblock/adblockaddsubscriptiondialog.cpp \
-    downloads/downloadfilehelper.cpp \
+    adblock/adblockblockednetworkreply.cpp \
-    tools/certificateinfowidget.cpp \
+    adblock/adblockdialog.cpp \
-    webview/webinspectordockwidget.cpp \
+    adblock/adblockicon.cpp \
-    preferences/acceptlanguage.cpp \
+    adblock/adblockmanager.cpp \
-    opensearch/opensearchreader.cpp \
+    adblock/adblockrule.cpp \
-    opensearch/opensearchengine.cpp \
+    adblock/adblocksearchtree.cpp \
-    opensearch/opensearchenginedelegate.cpp \
+    adblock/adblocksubscription.cpp \
-    opensearch/searchenginesmanager.cpp \
+    adblock/adblocktreewidget.cpp \
-    opensearch/searchenginesdialog.cpp \
+    app/autosaver.cpp \
-    opensearch/editsearchengine.cpp \
+    app/browserwindow.cpp \
+    app/commandlineoptions.cpp \
+    app/datapaths.cpp \
+    app/mainapplication.cpp \
+    app/mainmenu.cpp \
+    app/profilemanager.cpp \
+    app/proxystyle.cpp \
+    app/settings.cpp \
+    autofill/autofill.cpp \
+    autofill/autofillicon.cpp \
+    autofill/autofillnotification.cpp \
+    autofill/autofillwidget.cpp \
+    autofill/pageformcompleter.cpp \
+    autofill/passwordbackends/databaseencryptedpasswordbackend.cpp \
+    autofill/passwordbackends/databasepasswordbackend.cpp \
+    autofill/passwordbackends/passwordbackend.cpp \
+    autofill/passwordmanager.cpp \
+    bookmarks/bookmarkitem.cpp \
+    bookmarks/bookmarks.cpp \
+    bookmarks/bookmarksexport/bookmarksexportdialog.cpp \
+    bookmarks/bookmarksexport/bookmarksexporter.cpp \
+    bookmarks/bookmarksexport/htmlexporter.cpp \
+    bookmarks/bookmarksicon.cpp \
+    bookmarks/bookmarksimport/bookmarksimportdialog.cpp \
     bookmarks/bookmarksimport/bookmarksimporter.cpp \
     bookmarks/bookmarksimport/firefoximporter.cpp \
-    bookmarks/bookmarksimport/chromeimporter.cpp \
-    bookmarks/bookmarksimport/operaimporter.cpp \
-    bookmarks/bookmarksimport/ieimporter.cpp \
     bookmarks/bookmarksimport/htmlimporter.cpp \
-    bookmarks/bookmarksimport/bookmarksimportdialog.cpp \
+    bookmarks/bookmarksimport/chromeimporter.cpp \
-    tools/iconfetcher.cpp \
+    bookmarks/bookmarksimport/ieimporter.cpp \
-    tools/followredirectreply.cpp \
+    bookmarks/bookmarksimport/operaimporter.cpp \
-    tools/pagethumbnailer.cpp \
+    bookmarks/bookmarksitemdelegate.cpp \
-    plugins/speeddial.cpp \
+    bookmarks/bookmarksmanager.cpp \
-    tools/enhancedmenu.cpp \
+    bookmarks/bookmarksmenu.cpp \
-    navigation/siteicon.cpp \
+    bookmarks/bookmarksmodel.cpp \
-    navigation/goicon.cpp \
+    bookmarks/bookmarkstoolbarbutton.cpp \
-    rss/rssicon.cpp \
+    bookmarks/bookmarkstoolbar.cpp \
+    bookmarks/bookmarkstools.cpp \
+    bookmarks/bookmarkstreeview.cpp \
+    bookmarks/bookmarkswidget.cpp \
+    cookies/cookiejar.cpp \
+    cookies/cookiemanager.cpp \
+    downloads/downloadfilehelper.cpp \
+    downloads/downloaditem.cpp \
+    downloads/downloadmanager.cpp \
+    downloads/downloadoptionsdialog.cpp \
+    history/history.cpp \
+    history/historyitem.cpp \
+    history/historymanager.cpp \
+    history/historymenu.cpp \
+    history/historymodel.cpp \
+    history/historyview.cpp \
+    history/webhistoryinterface.cpp \
+    navigation/completer/locationcompleter.cpp \
+    navigation/completer/locationcompleterdelegate.cpp \
+    navigation/completer/locationcompletermodel.cpp \
+    navigation/completer/locationcompleterrefreshjob.cpp \
+    navigation/completer/locationcompleterview.cpp \
     navigation/downicon.cpp \
+    navigation/goicon.cpp \
+    navigation/locationbar.cpp \
+    navigation/locationbarpopup.cpp \
+    navigation/navigationbar.cpp \
+    navigation/navigationcontainer.cpp \
+    navigation/reloadstopbutton.cpp \
+    navigation/siteicon.cpp \
+    navigation/websearchbar.cpp \
     network/cabundleupdater.cpp \
-    app/settings.cpp \
+    network/networkmanager.cpp \
-    app/proxystyle.cpp \
+    network/networkmanagerproxy.cpp \
+    network/networkproxyfactory.cpp \
+    network/pac/pacmanager.cpp \
+    network/pac/proxyautoconfig.cpp \
+    network/schemehandlers/adblockschemehandler.cpp \
+    network/schemehandlers/fileschemehandler.cpp \
+    network/schemehandlers/ftpschemehandler.cpp \
+    network/schemehandlers/qupzillaschemehandler.cpp \
+    network/sslerrordialog.cpp \
+    notifications/desktopnotification.cpp \
+    notifications/desktopnotificationsfactory.cpp \
+    opensearch/editsearchengine.cpp \
+    opensearch/opensearchengine.cpp \
+    opensearch/opensearchenginedelegate.cpp \
+    opensearch/opensearchreader.cpp \
+    opensearch/searchenginesdialog.cpp \
+    opensearch/searchenginesmanager.cpp \
+    other/aboutdialog.cpp \
+    other/browsinglibrary.cpp \
+    other/clearprivatedata.cpp \
+    other/checkboxdialog.cpp \
+    other/iconchooser.cpp \
+    other/licenseviewer.cpp \
+    other/pagescreen.cpp \
+    other/qzsettings.cpp \
+    other/siteinfo.cpp \
+    other/siteinfowidget.cpp \
+    other/sourceviewer.cpp \
+    other/sourceviewersearch.cpp \
+    other/statusbarmessage.cpp \
+    other/updater.cpp \
+    other/useragentmanager.cpp \
+    plugins/clicktoflash.cpp \
+    plugins/pluginproxy.cpp \
+    plugins/plugins.cpp \
+    plugins/speeddial.cpp \
+    popupwindow/popuplocationbar.cpp \
+    popupwindow/popupstatusbarmessage.cpp \
     popupwindow/popupwebpage.cpp \
     popupwindow/popupwebview.cpp \
     popupwindow/popupwindow.cpp \
-    popupwindow/popuplocationbar.cpp \
+    preferences/acceptlanguage.cpp \
-    webview/tabbedwebview.cpp \
+    preferences/autofillmanager.cpp \
-    webview/webview.cpp \
+    preferences/jsoptions.cpp \
     preferences/pluginlistdelegate.cpp \
-    popupwindow/popupstatusbarmessage.cpp \
-    other/licenseviewer.cpp \
-    other/checkboxdialog.cpp \
-    tools/plaineditwithlines.cpp \
-    tools/focusselectlineedit.cpp \
-    navigation/completer/locationcompleterdelegate.cpp \
-    navigation/completer/locationcompleter.cpp \
-    navigation/completer/locationcompletermodel.cpp \
-    navigation/completer/locationcompleterview.cpp \
-    history/history.cpp \
-    history/historymodel.cpp \
-    history/historyview.cpp \
-    history/historyitem.cpp \
-    tools/headerview.cpp \
-    other/iconchooser.cpp \
-    adblock/adblocktreewidget.cpp \
-    adblock/adblockaddsubscriptiondialog.cpp \
-    tools/emptynetworkreply.cpp \
-    3rdparty/processinfo.cpp \
     preferences/pluginsmanager.cpp \
-    other/qzsettings.cpp \
+    preferences/preferences.cpp \
-    other/useragentmanager.cpp \
+    preferences/sslmanager.cpp \
+    preferences/thememanager.cpp \
     preferences/useragentdialog.cpp \
+    rss/rssicon.cpp \
+    rss/rssmanager.cpp \
+    rss/rssnotification.cpp \
+    rss/rsswidget.cpp \
     session/recoverywidget.cpp \
     session/restoremanager.cpp \
-    network/schemehandlers/qupzillaschemehandler.cpp \
+    sidebar/bookmarkssidebar.cpp \
-    network/schemehandlers/adblockschemehandler.cpp \
+    sidebar/historysidebar.cpp \
-    network/schemehandlers/fileschemehandler.cpp \
+    sidebar/sidebar.cpp \
-    tools/listitemdelegate.cpp \
+    tabwidget/combotabbar.cpp \
+    tabwidget/tabbar.cpp \
+    tabwidget/tabicon.cpp \
+    tabwidget/tabpreview.cpp \
+    tabwidget/tabstackedwidget.cpp \
+    tabwidget/tabwidget.cpp \
+    tools/actioncopy.cpp \
+    tools/aesinterface.cpp \
+    tools/animatedwidget.cpp \
+    tools/buttonbox.cpp \
+    tools/buttonwithmenu.cpp \
+    tools/certificateinfowidget.cpp \
+    tools/clickablelabel.cpp \
+    tools/closedtabsmanager.cpp \
+    tools/colors.cpp \
+    tools/delayedfilewatcher.cpp \
+    tools/docktitlebarwidget.cpp \
+    tools/emptynetworkreply.cpp \
+    tools/enhancedmenu.cpp \
+    tools/focusselectlineedit.cpp \
+    tools/followredirectreply.cpp \
+    tools/frame.cpp \
+    tools/headerview.cpp \
+    tools/horizontallistwidget.cpp \
+    tools/htmlhighlighter.cpp \
+    tools/html5permissions/html5permissionsdialog.cpp \
     tools/html5permissions/html5permissionsmanager.cpp \
     tools/html5permissions/html5permissionsnotification.cpp \
-    tools/html5permissions/html5permissionsdialog.cpp \
+    tools/iconfetcher.cpp \
-    autofill/pageformcompleter.cpp \
+    tools/iconprovider.cpp \
-    autofill/autofill.cpp \
-    network/schemehandlers/ftpschemehandler.cpp \
-    autofill/autofillicon.cpp \
-    autofill/autofillwidget.cpp \
-    tools/menubar.cpp \
-    navigation/navigationcontainer.cpp \
-    tools/horizontallistwidget.cpp \
-    tools/mactoolbutton.cpp \
-    tools/actioncopy.cpp \
-    network/pac/proxyautoconfig.cpp \
-    network/pac/pacmanager.cpp \
-    tools/delayedfilewatcher.cpp \
-    autofill/passwordmanager.cpp \
-    autofill/passwordbackends/databasepasswordbackend.cpp \
-    autofill/passwordbackends/passwordbackend.cpp \
-    tools/aesinterface.cpp \
-    autofill/passwordbackends/databaseencryptedpasswordbackend.cpp \
-    network/sslerrordialog.cpp \
-    adblock/adblocksearchtree.cpp \
-    tools/tabstackedwidget.cpp \
-    tools/combotabbar.cpp \
-    webview/javascript/externaljsobject.cpp \
-    bookmarks/bookmarks.cpp \
-    bookmarks/bookmarkitem.cpp \
     tools/json.cpp \
-    bookmarks/bookmarksmodel.cpp \
+    tools/listitemdelegate.cpp \
-    bookmarks/bookmarkstreeview.cpp \
+    tools/mactoolbutton.cpp \
-    bookmarks/bookmarkstools.cpp \
+    tools/menubar.cpp \
-    bookmarks/bookmarksmenu.cpp \
+    tools/pagethumbnailer.cpp \
-    bookmarks/bookmarksicon.cpp \
+    tools/plaineditwithlines.cpp \
-    bookmarks/bookmarksitemdelegate.cpp \
+    tools/progressbar.cpp \
-    bookmarks/bookmarkstoolbarbutton.cpp \
+    tools/qztools.cpp \
-    bookmarks/bookmarksexport/bookmarksexporter.cpp \
-    bookmarks/bookmarksexport/bookmarksexportdialog.cpp \
-    bookmarks/bookmarksexport/htmlexporter.cpp \
-    app/browserwindow.cpp \
-    history/historymenu.cpp \
-    app/datapaths.cpp \
-    app/profilemanager.cpp \
-    app/mainmenu.cpp \
     tools/sqldatabase.cpp \
-    navigation/completer/locationcompleterrefreshjob.cpp \
+    tools/toolbutton.cpp \
-    webview/tabicon.cpp \
+    tools/treewidget.cpp \
-    webview/loadrequest.cpp
+    tools/widget.cpp \
-
+    webkit/javascript/externaljsobject.cpp \
+    webkit/loadrequest.cpp \
+    webkit/webinspector.cpp \
+    webkit/webpage.cpp \
+    webkit/webpluginfactory.cpp \
+    webkit/webview.cpp \
+    webtab/searchtoolbar.cpp \
+    webtab/tabbedwebview.cpp \
+    webtab/webtab.cpp \
 
 HEADERS  += \
-    webview/tabpreview.h \
-    3rdparty/qtwin.h \
-    3rdparty/lineedit.h \
-    app/mainapplication.h \
-    app/autosaver.h \
-    preferences/autofillmanager.h \
-    bookmarks/bookmarkstoolbar.h \
-    bookmarks/bookmarksmanager.h \
-    cookies/cookiemanager.h \
-    cookies/cookiejar.h \
-    downloads/downloadmanager.h \
-    history/historymanager.h \
-    navigation/websearchbar.h \
-    navigation/locationbar.h \
-    network/networkmanagerproxy.h \
-    network/networkmanager.h \
-    other/updater.h \
-    other/sourceviewer.h \
-    preferences/preferences.h \
-    rss/rssmanager.h \
-    other/clearprivatedata.h \
-    webview/webpage.h \
-    webview/tabwidget.h \
-    webview/tabbar.h \
-    webview/siteinfo.h \
-    webview/searchtoolbar.h \
-    app/commandlineoptions.h \
-    other/aboutdialog.h \
-    plugins/plugininterface.h \
-    plugins/plugins.h \
-    plugins/pluginproxy.h \
-    tools/clickablelabel.h \
-    downloads/downloadoptionsdialog.h \
-    tools/treewidget.h \
-    bookmarks/bookmarkswidget.h \
-    tools/frame.h \
-    sidebar/sidebar.h \
-    webview/siteinfowidget.h \
-    plugins/clicktoflash.h \
-    plugins/webpluginfactory.h \
-    downloads/downloaditem.h \
     3rdparty/ecwin7.h \
-    webview/webtab.h \
-    rss/rsswidget.h \
-    autofill/autofillnotification.h \
-    rss/rssnotification.h \
-    preferences/sslmanager.h \
-    preferences/jsoptions.h \
-    tools/animatedwidget.h \
-    tools/htmlhighlighter.h \
-    other/sourceviewersearch.h \
-    adblock/adblocksubscription.h \
-    adblock/adblockrule.h \
-    adblock/adblockmanager.h \
-    adblock/adblockdialog.h \
-    adblock/adblockblockednetworkreply.h \
-    adblock/adblockicon.h \
-    tools/docktitlebarwidget.h \
-    sidebar/bookmarkssidebar.h \
-    sidebar/historysidebar.h \
-    desktopnotifications/desktopnotification.h \
-    desktopnotifications/desktopnotificationsfactory.h \
-    tools/progressbar.h \
-    tools/iconprovider.h \
-    network/networkproxyfactory.h \
-    tools/closedtabsmanager.h \
-    other/statusbarmessage.h \
-    tools/buttonbox.h \
-    tools/widget.h \
-    3rdparty/squeezelabelv2.h \
-    3rdparty/squeezelabelv1.h \
-    tools/buttonwithmenu.h \
-    other/browsinglibrary.h \
-    3rdparty/stylehelper.h \
     3rdparty/fancytabwidget.h \
-    history/webhistoryinterface.h \
+    3rdparty/lineedit.h \
-    tools/toolbutton.h \
-    navigation/navigationbar.h \
-    navigation/reloadstopbutton.h \
-    preferences/thememanager.h \
-    tools/qztools.h \
-    other/pagescreen.h \
-    downloads/downloadfilehelper.h \
-    tools/certificateinfowidget.h \
-    webview/webinspectordockwidget.h \
     3rdparty/msvc2008.h \
-    preferences/acceptlanguage.h \
+    3rdparty/processinfo.h \
-    opensearch/opensearchreader.h \
+    3rdparty/qtwin.h \
-    opensearch/opensearchengine.h \
+    3rdparty/squeezelabelv1.h \
-    opensearch/opensearchenginedelegate.h \
+    3rdparty/squeezelabelv2.h \
-    opensearch/searchenginesmanager.h \
+    3rdparty/stylehelper.h \
-    opensearch/searchenginesdialog.h \
+    adblock/adblockaddsubscriptiondialog.h \
-    opensearch/editsearchengine.h \
+    adblock/adblockblockednetworkreply.h \
+    adblock/adblockdialog.h \
+    adblock/adblockicon.h \
+    adblock/adblockmanager.h \
+    adblock/adblockrule.h \
+    adblock/adblocksearchtree.h \
+    adblock/adblocksubscription.h \
+    adblock/adblocktreewidget.h \
+    app/autosaver.h \
+    app/browserwindow.h \
+    app/commandlineoptions.h \
+    app/datapaths.h \
+    app/mainapplication.h \
+    app/mainmenu.h \
+    app/profilemanager.h \
+    app/proxystyle.h \
+    app/qzcommon.h \
+    app/settings.h \
+    autofill/autofill.h \
+    autofill/autofillicon.h \
+    autofill/autofillnotification.h \
+    autofill/autofillwidget.h \
+    autofill/pageformcompleter.h \
+    autofill/passwordbackends/databaseencryptedpasswordbackend.h \
+    autofill/passwordbackends/databasepasswordbackend.h \
+    autofill/passwordbackends/passwordbackend.h \
+    autofill/passwordmanager.h \
+    bookmarks/bookmarkitem.h \
+    bookmarks/bookmarksexport/bookmarksexportdialog.h \
+    bookmarks/bookmarksexport/bookmarksexporter.h \
+    bookmarks/bookmarksexport/htmlexporter.h \
+    bookmarks/bookmarks.h \
+    bookmarks/bookmarksicon.h \
+    bookmarks/bookmarksimport/bookmarksimportdialog.h \
     bookmarks/bookmarksimport/bookmarksimporter.h \
     bookmarks/bookmarksimport/firefoximporter.h \
-    bookmarks/bookmarksimport/chromeimporter.h \
-    bookmarks/bookmarksimport/operaimporter.h \
-    bookmarks/bookmarksimport/ieimporter.h \
     bookmarks/bookmarksimport/htmlimporter.h \
-    bookmarks/bookmarksimport/bookmarksimportdialog.h \
+    bookmarks/bookmarksimport/chromeimporter.h \
-    tools/iconfetcher.h \
+    bookmarks/bookmarksimport/ieimporter.h \
-    tools/followredirectreply.h \
+    bookmarks/bookmarksimport/operaimporter.h \
-    tools/pagethumbnailer.h \
+    bookmarks/bookmarksitemdelegate.h \
-    plugins/speeddial.h \
+    bookmarks/bookmarksmanager.h \
-    tools/enhancedmenu.h \
+    bookmarks/bookmarksmenu.h \
-    navigation/siteicon.h \
+    bookmarks/bookmarksmodel.h \
-    navigation/goicon.h \
+    bookmarks/bookmarkstoolbarbutton.h \
-    rss/rssicon.h \
+    bookmarks/bookmarkstoolbar.h \
+    bookmarks/bookmarkstools.h \
+    bookmarks/bookmarkstreeview.h \
+    bookmarks/bookmarkswidget.h \
+    cookies/cookiejar.h \
+    cookies/cookiemanager.h \
+    downloads/downloadfilehelper.h \
+    downloads/downloaditem.h \
+    downloads/downloadmanager.h \
+    downloads/downloadoptionsdialog.h \
+    history/history.h \
+    history/historyitem.h \
+    history/historymanager.h \
+    history/historymenu.h \
+    history/historymodel.h \
+    history/historyview.h \
+    history/webhistoryinterface.h \
+    navigation/completer/locationcompleterdelegate.h \
+    navigation/completer/locationcompleter.h \
+    navigation/completer/locationcompletermodel.h \
+    navigation/completer/locationcompleterrefreshjob.h \
+    navigation/completer/locationcompleterview.h \
     navigation/downicon.h \
+    navigation/goicon.h \
+    navigation/locationbar.h \
+    navigation/locationbarpopup.h \
+    navigation/navigationbar.h \
+    navigation/navigationcontainer.h \
+    navigation/reloadstopbutton.h \
+    navigation/siteicon.h \
+    navigation/websearchbar.h \
     network/cabundleupdater.h \
-    app/settings.h \
+    network/networkmanager.h \
-    app/proxystyle.h \
+    network/networkmanagerproxy.h \
+    network/networkproxyfactory.h \
+    network/pac/pacdatetime.h \
+    network/pac/pacmanager.h \
+    network/pac/proxyautoconfig.h \
+    network/schemehandlers/adblockschemehandler.h \
+    network/schemehandlers/fileschemehandler.h \
+    network/schemehandlers/ftpschemehandler.h \
+    network/schemehandlers/qupzillaschemehandler.h \
+    network/schemehandlers/schemehandler.h \
+    network/sslerrordialog.h \
+    notifications/desktopnotification.h \
+    notifications/desktopnotificationsfactory.h \
+    opensearch/editsearchengine.h \
+    opensearch/opensearchenginedelegate.h \
+    opensearch/opensearchengine.h \
+    opensearch/opensearchreader.h \
+    opensearch/searchenginesdialog.h \
+    opensearch/searchenginesmanager.h \
+    other/aboutdialog.h \
+    other/browsinglibrary.h \
+    other/clearprivatedata.h \
+    other/checkboxdialog.h \
+    other/iconchooser.h \
+    other/licenseviewer.h \
+    other/pagescreen.h \
+    other/qzsettings.h \
+    other/siteinfo.h \
+    other/siteinfowidget.h \
+    other/sourceviewer.h \
+    other/sourceviewersearch.h \
+    other/statusbarmessage.h \
+    other/updater.h \
+    other/useragentmanager.h \
+    plugins/clicktoflash.h \
+    plugins/plugininterface.h \
+    plugins/pluginproxy.h \
+    plugins/plugins.h \
+    plugins/speeddial.h \
+    popupwindow/popuplocationbar.h \
+    popupwindow/popupstatusbarmessage.h \
     popupwindow/popupwebpage.h \
     popupwindow/popupwebview.h \
     popupwindow/popupwindow.h \
-    popupwindow/popuplocationbar.h \
+    preferences/acceptlanguage.h \
-    webview/tabbedwebview.h \
+    preferences/autofillmanager.h \
-    webview/webview.h \
+    preferences/jsoptions.h \
     preferences/pluginlistdelegate.h \
-    popupwindow/popupstatusbarmessage.h \
-    other/licenseviewer.h \
-    other/checkboxdialog.h \
-    tools/plaineditwithlines.h \
-    sidebar/sidebarinterface.h \
-    tools/focusselectlineedit.h \
-    navigation/completer/locationcompleterdelegate.h \
-    navigation/completer/locationcompleter.h \
-    navigation/completer/locationcompleterview.h \
-    history/history.h \
-    history/historymodel.h \
-    history/historyview.h \
-    history/historyitem.h \
-    tools/headerview.h \
-    other/iconchooser.h \
-    adblock/adblocktreewidget.h \
-    adblock/adblockaddsubscriptiondialog.h \
-    tools/emptynetworkreply.h \
-    3rdparty/processinfo.h \
     preferences/pluginsmanager.h \
-    other/qzsettings.h \
+    preferences/preferences.h \
-    other/useragentmanager.h \
+    preferences/sslmanager.h \
+    preferences/thememanager.h \
     preferences/useragentdialog.h \
+    rss/rssicon.h \
+    rss/rssmanager.h \
+    rss/rssnotification.h \
+    rss/rsswidget.h \
     session/recoverywidget.h \
     session/restoremanager.h \
-    network/schemehandlers/schemehandler.h \
+    sidebar/bookmarkssidebar.h \
-    network/schemehandlers/qupzillaschemehandler.h \
+    sidebar/historysidebar.h \
-    network/schemehandlers/adblockschemehandler.h \
+    sidebar/sidebar.h \
-    network/schemehandlers/fileschemehandler.h \
+    sidebar/sidebarinterface.h \
-    tools/listitemdelegate.h \
+    tabwidget/combotabbar.h \
+    tabwidget/tabbar.h \
+    tabwidget/tabicon.h \
+    tabwidget/tabpreview.h \
+    tabwidget/tabstackedwidget.h \
+    tabwidget/tabwidget.h \
+    tools/actioncopy.h \
+    tools/aesinterface.h \
+    tools/animatedwidget.h \
+    tools/buttonbox.h \
+    tools/buttonwithmenu.h \
+    tools/certificateinfowidget.h \
+    tools/clickablelabel.h \
+    tools/closedtabsmanager.h \
+    tools/colors.h \
+    tools/delayedfilewatcher.h \
+    tools/docktitlebarwidget.h \
+    tools/emptynetworkreply.h \
+    tools/enhancedmenu.h \
+    tools/focusselectlineedit.h \
+    tools/followredirectreply.h \
+    tools/frame.h \
+    tools/headerview.h \
+    tools/horizontallistwidget.h \
+    tools/htmlhighlighter.h \
+    tools/html5permissions/html5permissionsdialog.h \
     tools/html5permissions/html5permissionsmanager.h \
     tools/html5permissions/html5permissionsnotification.h \
-    tools/html5permissions/html5permissionsdialog.h \
+    tools/iconfetcher.h \
-    autofill/pageformcompleter.h \
+    tools/iconprovider.h \
-    autofill/autofill.h \
-    network/schemehandlers/ftpschemehandler.h \
-    autofill/autofillicon.h \
-    autofill/autofillwidget.h \
-    tools/menubar.h \
-    navigation/navigationcontainer.h \
-    tools/horizontallistwidget.h \
-    tools/mactoolbutton.h \
-    tools/qzregexp.h \
-    tools/actioncopy.h \
-    network/pac/proxyautoconfig.h \
-    network/pac/pacmanager.h \
-    network/pac/pacdatetime.h \
-    tools/delayedfilewatcher.h \
-    autofill/passwordmanager.h \
-    autofill/passwordbackends/passwordbackend.h \
-    autofill/passwordbackends/databasepasswordbackend.h \
-    tools/aesinterface.h \
-    autofill/passwordbackends/databaseencryptedpasswordbackend.h \
-    network/sslerrordialog.h \
-    adblock/adblocksearchtree.h \
-    tools/tabstackedwidget.h \
-    tools/combotabbar.h \
-    webview/javascript/externaljsobject.h \
-    bookmarks/bookmarks.h \
-    bookmarks/bookmarkitem.h \
     tools/json.h \
-    bookmarks/bookmarksmodel.h \
+    tools/listitemdelegate.h \
-    bookmarks/bookmarkstreeview.h \
+    tools/mactoolbutton.h \
-    bookmarks/bookmarkstools.h \
+    tools/menubar.h \
-    bookmarks/bookmarksmenu.h \
+    tools/pagethumbnailer.h \
-    bookmarks/bookmarksicon.h \
+    tools/plaineditwithlines.h \
-    bookmarks/bookmarksitemdelegate.h \
+    tools/progressbar.h \
-    bookmarks/bookmarkstoolbarbutton.h \
+    tools/qztools.h \
-    bookmarks/bookmarksexport/bookmarksexporter.h \
-    bookmarks/bookmarksexport/bookmarksexportdialog.h \
-    bookmarks/bookmarksexport/htmlexporter.h \
-    app/browserwindow.h \
-    app/qzcommon.h \
-    history/historymenu.h \
-    app/datapaths.h \
-    app/profilemanager.h \
-    app/mainmenu.h \
     tools/sqldatabase.h \
-    navigation/completer/locationcompleterrefreshjob.h \
+    tools/toolbutton.h \
-    webview/tabicon.h \
+    tools/treewidget.h \
-    webview/loadrequest.h
+    tools/widget.h \
+    webkit/javascript/externaljsobject.h \
+    webkit/loadrequest.h \
+    webkit/webinspector.h \
+    webkit/webpage.h \
+    webkit/webpluginfactory.h \
+    webkit/webview.h \
+    webtab/searchtoolbar.h \
+    webtab/tabbedwebview.h \
+    webtab/webtab.h \
 
 FORMS    += \
-    preferences/autofillmanager.ui \
-    bookmarks/bookmarksmanager.ui \
-    cookies/cookiemanager.ui \
-    history/historymanager.ui \
-    preferences/preferences.ui \
-    rss/rssmanager.ui \
-    webview/siteinfo.ui \
-    other/aboutdialog.ui \
-    preferences/pluginslist.ui \
-    downloads/downloadoptionsdialog.ui \
-    bookmarks/bookmarkswidget.ui \
-    webview/siteinfowidget.ui \
-    downloads/downloaditem.ui \
-    downloads/downloadmanager.ui \
-    rss/rsswidget.ui \
-    autofill/autofillnotification.ui \
-    rss/rssnotification.ui \
-    preferences/sslmanager.ui \
-    preferences/jsoptions.ui \
-    other/clearprivatedata.ui \
-    other/sourceviewersearch.ui \
-    adblock/adblockdialog.ui \
-    tools/docktitlebarwidget.ui \
-    sidebar/bookmarkssidebar.ui \
-    sidebar/historysidebar.ui \
-    desktopnotifications/desktopnotification.ui \
-    webview/jsconfirm.ui \
-    webview/jsalert.ui \
-    webview/jsprompt.ui \
-    other/browsinglibrary.ui \
-    webview/searchtoolbar.ui \
-    preferences/thememanager.ui \
-    other/pagescreen.ui \
-    tools/certificateinfowidget.ui \
-    preferences/acceptlanguage.ui \
-    preferences/addacceptlanguage.ui \
-    opensearch/searchenginesdialog.ui \
-    opensearch/editsearchengine.ui \
-    bookmarks/bookmarksimport/bookmarksimportdialog.ui \
-    other/checkboxdialog.ui \
-    other/iconchooser.ui \
     adblock/adblockaddsubscriptiondialog.ui \
-    preferences/useragentdialog.ui \
+    adblock/adblockdialog.ui \
-    session/recoverywidget.ui \
+    autofill/autofillnotification.ui \
-    tools/html5permissions/html5permissionsnotification.ui \
-    tools/html5permissions/html5permissionsdialog.ui \
     autofill/autofillwidget.ui \
     autofill/passwordbackends/masterpassworddialog.ui \
+    bookmarks/bookmarksexport/bookmarksexportdialog.ui \
+    bookmarks/bookmarksimport/bookmarksimportdialog.ui \
+    bookmarks/bookmarksmanager.ui \
+    bookmarks/bookmarkswidget.ui \
+    cookies/cookiemanager.ui \
+    downloads/downloaditem.ui \
+    downloads/downloadmanager.ui \
+    downloads/downloadoptionsdialog.ui \
+    history/historymanager.ui \
     network/sslerrordialog.ui \
-    bookmarks/bookmarksexport/bookmarksexportdialog.ui
+    notifications/desktopnotification.ui \
+    opensearch/editsearchengine.ui \
+    opensearch/searchenginesdialog.ui \
+    other/aboutdialog.ui \
+    other/browsinglibrary.ui \
+    other/clearprivatedata.ui \
+    other/checkboxdialog.ui \
+    other/iconchooser.ui \
+    other/pagescreen.ui \
+    other/siteinfo.ui \
+    other/siteinfowidget.ui \
+    other/sourceviewersearch.ui \
+    preferences/acceptlanguage.ui \
+    preferences/addacceptlanguage.ui \
+    preferences/autofillmanager.ui \
+    preferences/jsoptions.ui \
+    preferences/pluginslist.ui \
+    preferences/preferences.ui \
+    preferences/sslmanager.ui \
+    preferences/thememanager.ui \
+    preferences/useragentdialog.ui \
+    rss/rssmanager.ui \
+    rss/rssnotification.ui \
+    rss/rsswidget.ui \
+    session/recoverywidget.ui \
+    sidebar/bookmarkssidebar.ui \
+    sidebar/historysidebar.ui \
+    tools/certificateinfowidget.ui \
+    tools/docktitlebarwidget.ui \
+    tools/html5permissions/html5permissionsdialog.ui \
+    tools/html5permissions/html5permissionsnotification.ui \
+    webkit/jsalert.ui \
+    webkit/jsconfirm.ui \
+    webkit/jsprompt.ui \
+    webtab/searchtoolbar.ui \
 
 RESOURCES += \
-    data/icons.qrc \
-    data/html.qrc \
-    data/data.qrc \
     data/certs.qrc \
+    data/data.qrc \
+    data/html.qrc \
+    data/icons.qrc \
     data/oxygen-fallback.qrc
 
 isEqual(QT_MAJOR_VERSION, 5) {
-    include(3rdparty/qftp.pri)
+    include(3rdparty/qftp/qftp.pri)
-
     SOURCES += tools/qzregexp.cpp
 }
 

src/lib/webkit/webinspector.cpp

@@ -15,7 +15,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * ============================================================ */
-#include "webinspectordockwidget.h"
+#include "webinspector.h"
 #include "docktitlebarwidget.h"
 #include "webpage.h"
 #include "tabbedwebview.h"

src/main/main.pro

@@ -16,24 +16,22 @@ TEMPLATE = app
 
 unix:!contains(DEFINES, "DISABLE_DBUS") QT += dbus
 
-INCLUDEPATH += ../lib/app\
+INCLUDEPATH += ../lib/app \
-               ../lib/3rdparty\
+               ../lib/session \
-               ../lib/session\
+               ../lib/webtab \
-               ../lib/webview
 
-DEPENDPATH += ../lib/app\
+DEPENDPATH += $$INCLUDEPATH
-              ../lib/3rdparty\
-              ../lib/session\
-              ../lib/webview
 
 SOURCES = main.cpp
+
 OTHER_FILES += appicon.rc \
                appicon_os2.rc \
-               Info.plist
+               Info.plist \
 
 os2:RC_FILE = appicon_os2.rc
 win32:RC_FILE = appicon.rc
 
 include(../install.pri)
+include(../lib/3rdparty/qtsingleapplication/qtsingleapplication.pri)
 
 unix:contains(DEFINES, "NO_SYSTEM_DATAPATH"): QMAKE_LFLAGS+=$${QMAKE_LFLAGS_RPATH}\\$\$ORIGIN

src/plugins.pri

@@ -1,52 +1,33 @@
 include(defines.pri)
 
-INCLUDEPATH += $$PWD/lib/3rdparty\
+INCLUDEPATH += $$PWD/lib/3rdparty \
-               $$PWD/lib/app\
+               $$PWD/lib/adblock \
-               $$PWD/lib/autofill\
+               $$PWD/lib/app \
-               $$PWD/lib/bookmarks\
+               $$PWD/lib/autofill \
-               $$PWD/lib/cookies\
+               $$PWD/lib/bookmarks \
-               $$PWD/lib/session\
+               $$PWD/lib/cookies \
-               $$PWD/lib/downloads\
+               $$PWD/lib/downloads \
-               $$PWD/lib/history\
+               $$PWD/lib/history \
-               $$PWD/lib/navigation\
+               $$PWD/lib/navigation \
-               $$PWD/lib/network\
+               $$PWD/lib/network \
-               $$PWD/lib/other\
+               $$PWD/lib/notifications \
-               $$PWD/lib/preferences\
+               $$PWD/lib/opensearch \
-               $$PWD/lib/rss\
+               $$PWD/lib/other \
-               $$PWD/lib/tools\
+               $$PWD/lib/plugins \
-               $$PWD/lib/utils\
+               $$PWD/lib/popupwindow \
-               $$PWD/lib/webview\
+               $$PWD/lib/preferences \
-               $$PWD/lib/plugins\
+               $$PWD/lib/rss \
-               $$PWD/lib/sidebar\
+               $$PWD/lib/session \
-               $$PWD/lib/data\
+               $$PWD/lib/sidebar \
-               $$PWD/lib/adblock\
+               $$PWD/lib/tabwidget \
-               $$PWD/lib/desktopnotifications\
+               $$PWD/lib/tools \
-               $$PWD/lib/opensearch\
+               $$PWD/lib/webkit \
-               $$PWD/lib/popupwindow\
+               $$PWD/lib/webtab \
 
-DEPENDPATH += $$PWD/lib/3rdparty\
+DEPENDPATH += $$INCLUDEPATH \
-              $$PWD/lib/app\
+              $$PWD/lib/data \
-              $$PWD/lib/autofill\
+
-              $$PWD/lib/bookmarks\
+include(lib/3rdparty/qtsingleapplication/qtsingleapplication.pri)
-              $$PWD/lib/cookies\
-              $$PWD/lib/session\
-              $$PWD/lib/downloads\
-              $$PWD/lib/history\
-              $$PWD/lib/navigation\
-              $$PWD/lib/network\
-              $$PWD/lib/other\
-              $$PWD/lib/preferences\
-              $$PWD/lib/rss\
-              $$PWD/lib/tools\
-              $$PWD/lib/utils\
-              $$PWD/lib/webview\
-              $$PWD/lib/plugins\
-              $$PWD/lib/sidebar\
-              $$PWD/lib/data\
-              $$PWD/lib/adblock\
-              $$PWD/lib/desktopnotifications\
-              $$PWD/lib/opensearch\
-              $$PWD/lib/popupwindow\
 
 TEMPLATE = lib
 CONFIG += plugin

tests/autotests/autotests.pro

@@ -33,30 +33,29 @@ MOC_DIR = build
 RCC_DIR = build
 UI_DIR = build
 
-INCLUDEPATH += $$PWD/../../src/lib/3rdparty\
+INCLUDEPATH += $$PWD/../../src/lib/3rdparty \
-               $$PWD/../../src/lib/app\
+               $$PWD/../../src/lib/adblock \
-               $$PWD/../../src/lib/autofill\
+               $$PWD/../../src/lib/app \
-               $$PWD/../../src/lib/bookmarks\
+               $$PWD/../../src/lib/autofill \
-               $$PWD/../../src/lib/cookies\
+               $$PWD/../../src/lib/bookmarks \
-               $$PWD/../../src/lib/session\
+               $$PWD/../../src/lib/cookies \
-               $$PWD/../../src/lib/downloads\
+               $$PWD/../../src/lib/downloads \
-               $$PWD/../../src/lib/history\
+               $$PWD/../../src/lib/history \
-               $$PWD/../../src/lib/navigation\
+               $$PWD/../../src/lib/navigation \
-               $$PWD/../../src/lib/network\
+               $$PWD/../../src/lib/network \
-               $$PWD/../../src/lib/other\
+               $$PWD/../../src/lib/notifications \
-               $$PWD/../../src/lib/preferences\
+               $$PWD/../../src/lib/opensearch \
-               $$PWD/../../src/lib/rss\
+               $$PWD/../../src/lib/other \
-               $$PWD/../../src/lib/tools\
+               $$PWD/../../src/lib/plugins \
-               $$PWD/../../src/lib/utils\
+               $$PWD/../../src/lib/popupwindow \
-               $$PWD/../../src/lib/webview\
+               $$PWD/../../src/lib/preferences \
-               $$PWD/../../src/lib/plugins\
+               $$PWD/../../src/lib/rss \
-               $$PWD/../../src/lib/sidebar\
+               $$PWD/../../src/lib/session \
-               $$PWD/../../src/lib/data\
+               $$PWD/../../src/lib/sidebar \
-               $$PWD/../../src/lib/adblock\
+               $$PWD/../../src/lib/tabwidget \
-               $$PWD/../../src/lib/desktopnotifications\
+               $$PWD/../../src/lib/tools \
-               $$PWD/../../src/lib/opensearch\
+               $$PWD/../../src/lib/webkit \
-               $$PWD/../../src/lib/bookmarksimport\
+               $$PWD/../../src/lib/webtab \
-               $$PWD/../../src/lib/popupwindow\
 
 HEADERS += \
     qztoolstest.h \