|
|
@@ -1,7 +1,6 @@
|
|
|
-diff -Naur scribus-0.9.10.orig/scribus/scribus.cpp scribus-0.9.10/scribus/scribus.cpp
|
|
|
---- scribus-0.9.10.orig/scribus/scribus.cpp Sat Apr 19 12:09:44 2003
|
|
|
-+++ scribus-0.9.10/scribus/scribus.cpp Tue May 13 16:07:27 2003
|
|
|
-@@ -2877,7 +2877,7 @@
|
|
|
+--- scribus-0.9.10.orig/scribus/scribus.cpp 2003-06-16 07:26:32.000000000 +0200
|
|
|
++++ scribus-0.9.10/scribus/scribus.cpp 2003-06-16 07:27:19.000000000 +0200
|
|
|
+@@ -3040,7 +3040,7 @@
|
|
|
void ScribusApp::slotHelpAbout()
|
|
|
{
|
|
|
void *mo;
|
|
|
@@ -10,7 +9,7 @@ diff -Naur scribus-0.9.10.orig/scribus/scribus.cpp scribus-0.9.10/scribus/scribu
|
|
|
typedef About* (*sdem)(QWidget *d);
|
|
|
sdem demo;
|
|
|
QString pfad = PREL;
|
|
|
-@@ -4433,7 +4433,7 @@
|
|
|
+@@ -4694,7 +4694,7 @@
|
|
|
void ScribusApp::slotPrefsOrg()
|
|
|
{
|
|
|
void *mo;
|
|
|
@@ -19,7 +18,7 @@ diff -Naur scribus-0.9.10.orig/scribus/scribus.cpp scribus-0.9.10/scribus/scribu
|
|
|
typedef Preferences* (*sdem)(QWidget *d, preV *Vor);
|
|
|
sdem demo;
|
|
|
QString pfad = PREL;
|
|
|
-@@ -4831,7 +4831,7 @@
|
|
|
+@@ -5153,7 +5153,7 @@
|
|
|
|
|
|
PSLib* ScribusApp::getPSDriver(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf)
|
|
|
{
|
|
|
@@ -28,16 +27,16 @@ diff -Naur scribus-0.9.10.orig/scribus/scribus.cpp scribus-0.9.10/scribus/scribu
|
|
|
typedef PSLib* (*sdem)(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf);
|
|
|
sdem demo;
|
|
|
QString pfad = PREL;
|
|
|
-@@ -4861,7 +4861,7 @@
|
|
|
-
|
|
|
- PDFlib* ScribusApp::getPDFDriver()
|
|
|
+@@ -5188,7 +5188,7 @@
|
|
|
+ bool ScribusApp::getPDFDriver(QString fn, QString nam, int Components, int frPa, int toPa, QMap<int,QPixmap> thumbs)
|
|
|
{
|
|
|
+ bool ret = false;
|
|
|
- char *error;
|
|
|
+ const char *error;
|
|
|
- typedef PDFlib* (*sdem)();
|
|
|
+ void *PDFDriver;
|
|
|
+ typedef bool (*sdem)(ScribusApp *plug, QString fn, QString nam, int Components, int frPa, int toPa, QMap<int,QPixmap> thumbs);
|
|
|
sdem demo;
|
|
|
- QString pfad = PREL;
|
|
|
-@@ -5418,7 +5418,7 @@
|
|
|
+@@ -5734,7 +5734,7 @@
|
|
|
|
|
|
void ScribusApp::FinalizePlugs()
|
|
|
{
|
|
|
@@ -46,7 +45,7 @@ diff -Naur scribus-0.9.10.orig/scribus/scribus.cpp scribus-0.9.10/scribus/scribu
|
|
|
QMap<QString, PlugData>::Iterator it;
|
|
|
struct PlugData pda;
|
|
|
typedef void (*sdem2)();
|
|
|
-@@ -5483,7 +5483,7 @@
|
|
|
+@@ -5804,7 +5804,7 @@
|
|
|
void ScribusApp::CallDLL(QString name)
|
|
|
{
|
|
|
void *mo;
|
|
|
@@ -55,7 +54,7 @@ diff -Naur scribus-0.9.10.orig/scribus/scribus.cpp scribus-0.9.10/scribus/scribu
|
|
|
struct PlugData pda;
|
|
|
pda = PluginMap[name];
|
|
|
typedef void (*sdem)(QWidget *d, ScribusApp *plug);
|
|
|
-@@ -5517,7 +5517,7 @@
|
|
|
+@@ -5838,7 +5838,7 @@
|
|
|
bool ScribusApp::DLLName(QString name, QString *PName, int *typ, void **Zeig)
|
|
|
{
|
|
|
void *mo;
|