summaryrefslogtreecommitdiffstats
path: root/src/inkview.cpp
diff options
context:
space:
mode:
authorLiam P. White <inkscapebrony@gmail.com>2014-11-26 01:17:02 +0000
committerLiam P. White <inkscapebrony@gmail.com>2014-11-26 01:17:02 +0000
commitbed3cc55fe40330718204c540b328d95407b00fa (patch)
treee4269aab0a32957163935ec6b828b25d00613d68 /src/inkview.cpp
parentAdd CMake file to find LCMS2 (diff)
parentUpdate to trunk r13766 (diff)
downloadinkscape-bed3cc55fe40330718204c540b328d95407b00fa.tar.gz
inkscape-bed3cc55fe40330718204c540b328d95407b00fa.zip
Merge inkscape-cppify branch
(bzr r13767)
Diffstat (limited to 'src/inkview.cpp')
-rw-r--r--src/inkview.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/inkview.cpp b/src/inkview.cpp
index 2969bb140..0b7b4d35c 100644
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
@@ -60,9 +60,7 @@
#include "io/inkjar.h"
#endif
-#include "inkscape-private.h"
-
-InkscapeApplication *inkscape;
+#include "inkscape.h"
#include <iostream>
@@ -232,7 +230,8 @@ main (int argc, const char **argv)
ss.view = NULL;
ss.fullscreen = false;
- inkscape = (InkscapeApplication *)g_object_new (SP_TYPE_INKSCAPE, NULL);
+ Inkscape::Application::create(argv[0], true);
+ //Inkscape::Application &inkscape = Inkscape::Application::instance();
// starting at where the commandline options stopped parsing because
// we want all the files to be in the list