X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=main.cpp;h=690a559c29e9a8952b74e2a840475b227650d5b3;hb=489953884c0d7692fa20748314751e114ae54cf2;hp=78a131a5f1e108c9548cc34f1f19ea5bea6e6abb;hpb=f74015db20c1ac85df6397df7199a030e6db828f;p=pulseview.git
diff --git a/main.cpp b/main.cpp
index 78a131a..690a559 100644
--- a/main.cpp
+++ b/main.cpp
@@ -14,15 +14,14 @@
* 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 .
*/
#ifdef ENABLE_DECODE
#include /* First, so we avoid a _POSIX_C_SOURCE warning. */
#endif
-#include
+#include
#include
#include
@@ -45,11 +44,15 @@
#include "config.h"
#ifdef _WIN32
-// The static qsvg lib is required for SVG graphics/icons (on Windows).
#include
-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 context;
- std::string open_file, open_file_format;
+ shared_ptr context;
+ string open_file, open_file_format;
Application a(argc, argv);
@@ -82,7 +85,7 @@ int main(int argc, char *argv[])
#endif
// Parse arguments
- while (1) {
+ while (true) {
static const struct option long_options[] = {
{"help", no_argument, nullptr, 'h'},
{"version", no_argument, nullptr, 'V'},
@@ -133,10 +136,11 @@ int main(int argc, char *argv[])
if (argc - optind > 1) {
fprintf(stderr, "Only one file can be opened.\n");
return 1;
- } else if (argc - optind == 1) {
- open_file = argv[argc - 1];
}
+ if (argc - optind == 1)
+ open_file = argv[argc - 1];
+
// Initialise libsigrok
context = sigrok::Context::create();
#ifdef ANDROID
@@ -183,7 +187,7 @@ int main(int argc, char *argv[])
// Run the application
ret = a.exec();
- } catch (std::exception e) {
+ } catch (exception e) {
qDebug() << e.what();
}
@@ -192,7 +196,7 @@ int main(int argc, char *argv[])
srd_exit();
#endif
- } while (0);
+ } while (false);
return ret;
}