X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=febe729c4bc97d0ea25e095ada555525c8f062b2;hp=d15cff89ee61ed852be33065e764be35e5253366;hb=6a6772b7da8fcc841c2db16dfec5b26cd5bcd8b0;hpb=b3f22de060b73f15ad3eb2dabee04a0b4f5d947e

diff --git a/main.cpp b/main.cpp
index d15cff89..febe729c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -26,33 +26,36 @@ 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);
+	// Set some application metadata
+	QApplication::setApplicationVersion(PV_VERSION_STRING);
 	QApplication::setApplicationName("PulseView");
 	QApplication::setOrganizationDomain("http://www.sigrok.org");
 
-	/* Initialise libsigrok */
+	// Initialise libsigrok
 	if (sr_init() != SR_OK) {
 		qDebug() << "ERROR: libsigrok init failed.";
 		return 1;
 	}
 
-	/* Initialise libsigrokdecode */
+	// Initialise libsigrokdecode
 	if (srd_init(NULL) != SRD_OK) {
 		qDebug() << "ERROR: libsigrokdecode init failed.";
 		return 1;
 	}
 
-	/* Load the protocol decoders */
+	// Load the protocol decoders
 	srd_decoder_load_all();
 
-	/* Initialize all libsigrok drivers. */
+	// Initialize all libsigrok drivers
 	sr_dev_driver **const drivers = sr_driver_list();
 	for (sr_dev_driver **driver = drivers; *driver; driver++) {
 		if (sr_driver_init(*driver) != SR_OK) {
@@ -62,14 +65,14 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	/* Initialise the main window */
-	MainWindow w;
+	// Initialise the main window
+	pv::MainWindow w;
 	w.show();
 
-	/* Run the application */
+	// Run the application
 	const int ret = a.exec();
 
-	/* Destroy libsigrokdecode and libsigrok */
+	// Destroy libsigrokdecode and libsigrok
 	srd_exit();
 	sr_exit();