X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=51e6100295d18efc113d825351ee4390a54eb0ba;hp=daec62d2af09055409677d90885bc9faac5ce4af;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=dddff2e7c658aa84f67186ade0a4845b5fb0b43f

diff --git a/main.cpp b/main.cpp
index daec62d2..51e61002 100644
--- a/main.cpp
+++ b/main.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef ENABLE_DECODE
@@ -45,11 +44,15 @@
 #include "config.h"
 
 #ifdef _WIN32
-// The static qsvg lib is required for SVG graphics/icons (on Windows).
 #include <QtPlugin>
-Q_IMPORT_PLUGIN(qsvg)
+Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
+Q_IMPORT_PLUGIN(QSvgPlugin)
 #endif
 
+using std::exception;
+using std::shared_ptr;
+using std::string;
+
 void usage()
 {
 	fprintf(stdout,
@@ -70,8 +73,8 @@ void usage()
 int main(int argc, char *argv[])
 {
 	int ret = 0;
-	std::shared_ptr<sigrok::Context> context;
-	std::string open_file, open_file_format;
+	shared_ptr<sigrok::Context> context;
+	string open_file, open_file_format;
 
 	Application a(argc, argv);
 
@@ -84,12 +87,12 @@ int main(int argc, char *argv[])
 	// Parse arguments
 	while (1) {
 		static const struct option long_options[] = {
-			{"help", no_argument, 0, 'h'},
-			{"version", no_argument, 0, 'V'},
-			{"loglevel", required_argument, 0, 'l'},
-			{"input-file", required_argument, 0, 'i'},
-			{"input-format", required_argument, 0, 'I'},
-			{0, 0, 0, 0}
+			{"help", no_argument, nullptr, 'h'},
+			{"version", no_argument, nullptr, 'V'},
+			{"loglevel", required_argument, nullptr, 'l'},
+			{"input-file", required_argument, nullptr, 'i'},
+			{"input-format", required_argument, nullptr, 'I'},
+			{nullptr, 0, nullptr, 0}
 		};
 
 		const int c = getopt_long(argc, argv,
@@ -131,7 +134,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (argc - optind > 1) {
-		fprintf(stderr, "Only one file can be openened.\n");
+		fprintf(stderr, "Only one file can be opened.\n");
 		return 1;
 	} else if (argc - optind == 1) {
 		open_file = argv[argc - 1];
@@ -183,7 +186,7 @@ int main(int argc, char *argv[])
 			// Run the application
 			ret = a.exec();
 
-		} catch(std::exception e) {
+		} catch (exception e) {
 			qDebug() << e.what();
 		}