X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=661c84a6d23c0ea40d128a52fe8584608f624fd7;hp=3d6b86e3651b3004c95d87c8d7d0c77c41024613;hb=075fb4995aaaf521502571d26da62a6923555eff;hpb=6fb67b27a85f19002d43b8c8498ca7d2979401b0;ds=sidebyside

diff --git a/main.cpp b/main.cpp
index 3d6b86e3..661c84a6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the PulseView project.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
@@ -26,15 +26,18 @@ extern "C" {
 
 #include <QtGui/QApplication>
 #include <QDebug>
-#include "mainwindow.h"
+
+#include "pv/mainwindow.h"
+
+#include "config.h"
 
 int main(int argc, char *argv[])
 {
 	QApplication a(argc, argv);
 
 	/* Set some application metadata. */
-	QApplication::setApplicationVersion(APP_VERSION);
-	QApplication::setApplicationName("sigrok-qt");
+	QApplication::setApplicationVersion(PV_VERSION_STRING);
+	QApplication::setApplicationName("PulseView");
 	QApplication::setOrganizationDomain("http://www.sigrok.org");
 
 	/* Initialise libsigrok */
@@ -63,7 +66,7 @@ int main(int argc, char *argv[])
 	}
 
 	/* Initialise the main window */
-	MainWindow w;
+	pv::MainWindow w;
 	w.show();
 
 	/* Run the application */