Rename rView to RekonqView

- move rview.hpp to include/
- move src/mainwindow/* to src/

1 files changed, 5 insertions, 5 deletions

diff --git a/src/application.hpp b/src/application.hpp
index ce4bbfd1..7d75af3a 100644
--- a/src/application.hpp
+++ b/src/application.hpp
@@ -11,15 +11,15 @@
 
 #pragma once
 
-#include "mainwindow/rekonqwindow.h"
 #include "rekonq.hpp"
+#include "rekonqwindow.h"
 #include <QPointer>
 #include <QUrl>
 #include <QWidget>
 #include <SingleApplication>
 
 // Forward Declarations
-class rView;
+class RekonqView;
 class PluginLoader;
 
 // class WebTab;
@@ -27,7 +27,7 @@ class PluginLoader;
 
 typedef QList<QPointer<PluginLoader>> RekonqPluginList;
 typedef QList<QPointer<RekonqWindow>> RekonqWindowList;
-typedef QList<QPointer<rView>> RekonqViewList;
+typedef QList<QPointer<RekonqView>> RekonqViewList;
 
 // ---------------------------------------------------------------------------------------------------------------
 
@@ -75,7 +75,7 @@ public slots:
    * @param instanceId if the current instance, check QCoreApplication::arguments instead of @param message
    * @param message the command line
    */
-  void parseCommandLine(int instanceId, const QByteArray &message);
+  void parseCommandLine(quint32 instanceId, const QByteArray &message);
 
   /**
    * Save application's configuration
@@ -95,7 +95,7 @@ public slots:
   // RekonqWindow *newWindow(bool withTab = true, bool PrivateBrowsingMode = false);
   // RekonqWindow *newWindow(WebPage *pg);
   RekonqWindow *newWindow();
-  rView *newView(const QUrl &url = QUrl(), RekonqWindow *window = nullptr);
+  RekonqView *newView(const QUrl &url = QUrl(), RekonqWindow *window = nullptr);
 
   // void createWebAppShortcut(const QString & urlString = QString(), const QString & titleString = QString());