X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=51e6100295d18efc113d825351ee4390a54eb0ba;hp=78a131a5f1e108c9548cc34f1f19ea5bea6e6abb;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=f74015db20c1ac85df6397df7199a030e6db828f
diff --git a/main.cpp b/main.cpp
index 78a131a..51e6100 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,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);
@@ -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();
}