X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=main.cpp;h=0881c184a913d3c704abffca86e50485166e2da9;hb=8b2eb22ed4f467f5364e8e9824a12137e2433b7e;hp=7ac7ef36f66c713dcd9ef80f0595000d7f54d53e;hpb=2ad82c2e40b6865481733913a2c32735602f63c4;p=pulseview.git
diff --git a/main.cpp b/main.cpp
index 7ac7ef3..0881c18 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 .
*/
#ifdef ENABLE_DECODE
@@ -45,9 +44,9 @@
#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
void usage()
@@ -84,12 +83,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 +130,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];