View Issue Details

Jump to NotesJump to History
IDProjectCategoryView StatusDate SubmittedLast Update
0002173ScribusInternalpublic2005-07-02 15:122005-07-06 04:42
Reporterjghali Assigned Toringerc 
PrioritynormalSeverityminorReproducibilityalways
Status closedResolutionfixed 
PlatformWindowsOSWindowsOS Version2000 SP4
Product Version1.3.0cvs 
Fixed in Version1.3.0cvs 
Summary0002173: Coherence in use of configuration files (config.h / win-config.h)
DescriptionSome files use :

#include <config.h>

Others use:

#ifdef _MSC_VER
 #if (_MSC_VER >= 1200)
  #include "win-config.h"
 #endif
#else
 #include "config.h"
#endif

These should be fixed.
TagsNo tags attached.
Patch

Relationships

child of 0000015 closedjghali Windows Port 

Activities

cbradney

2005-07-02 17:15

administrator   ~0005340

Got a list? or not? I certainly cant find any that contain <config.h> at least.

jghali

2005-07-02 17:34

administrator   ~0005341

Dont' have list, but it just take a minute with mscv... I can do it, if you want, and submit diff (tomorrow, don't have msvc on hand). But instead of using #ifdef _MSC_VER... across all files, I suggest using for example #include SC_CONFIG_HEADER where SC_CONFIG_HEADER (config.h or win-config.h) would be defined at compile time. What do you think about that???

ringerc

2005-07-03 14:08

reporter   ~0005358

I can probably do this with a bit of awk/sed.

jghali

2005-07-03 14:45

administrator   ~0005359

I'm going to the office soon. Tell me what solution you prefer and I'm going to do it.

ringerc

2005-07-03 14:54

reporter   ~0005360

I'm not sure about using a compile-time define. I have the feeling that might mess up the dependency tracking done by autohell, though I'd need to do some testing to confirm.

Frankly, I think it's probably OK to just drop the lot in verbatim. Failing that, I'd make a header "scconfig.h" that contained the macros and include it. That should be OK with the dependency tracking.

I remain puzzled as to why config.h isn't just defined as:



#ifdef _MSC_VER
 #if (_MSC_VER >= 1200)
  #include "win-config.h"
 #endif
#else
 ... body of config.h ...
#endif

jghali

2005-07-03 15:08

administrator   ~0005361

I asked myself the same question... It's probably the simplest solution.

cbradney

2005-07-03 15:08

administrator   ~0005362

The idea of an scconfig.h is probably the easiest. Allows for more options in the future I think.

jghali

2005-07-03 15:18

administrator   ~0005363

Yes. The simplest is not necessary the best... scconfig.h allows more flexibility.

cbradney

2005-07-03 15:20

administrator   ~0005364

config.h cant be:
#ifdef _MSC_VER
 #if (_MSC_VER >= 1200)
  #include "win-config.h"
 #endif
#else
 ... body of config.h ...
#endif
because win-config.h replaces some of config.h and it would get very confusing. scconfig.h is probably easier and cleaner.

jghali

2005-07-03 15:44

administrator   ~0005366

Agree, scconfig.h is certainly the cleanest solution. So let's go for this one. Add scconfig.h to cvs. I'll submit diff for all files tonight. Ok?

cbradney

2005-07-03 15:47

administrator   ~0005367

Sounds great

2005-07-03 16:34

 

scconfig_replacement.diff (41,270 bytes)    
Index: scribus/about.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/Attic/about.cpp,v
retrieving revision 1.1.2.97
diff -u -r1.1.2.97 about.cpp
--- scribus/about.cpp	2 Jul 2005 12:35:50 -0000	1.1.2.97
+++ scribus/about.cpp	3 Jul 2005 18:27:08 -0000
@@ -12,13 +12,7 @@
 #include <qtextstream.h>
 #include <qtooltip.h>
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 #include "langmgr.h"
 
Index: scribus/art_kmisc.c
===================================================================
RCS file: /cvs/Scribus/scribus/art_kmisc.c,v
retrieving revision 1.5
diff -u -r1.5 art_kmisc.c
--- scribus/art_kmisc.c	29 May 2004 14:38:19 -0000	1.5
+++ scribus/art_kmisc.c	3 Jul 2005 18:27:08 -0000
@@ -4,7 +4,7 @@
 #include <libart_lgpl/art_affine.h>
 #include <libart_lgpl/art_svp_render_aa.h>
 
-#include "config.h"
+#include "scconfig.h"
 #include "art_kmisc.h"
 
 extern double ceil(double x);
Index: scribus/art_render_misc.c
===================================================================
RCS file: /cvs/Scribus/scribus/art_render_misc.c,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 art_render_misc.c
--- scribus/art_render_misc.c	14 Nov 2004 16:12:43 -0000	1.2.2.1
+++ scribus/art_render_misc.c	3 Jul 2005 18:27:08 -0000
@@ -29,13 +29,7 @@
  *          Alexander Larsson <alla@lysator.liu.se>
  */
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 #include "art_render_misc.h"
 
Index: scribus/art_render_pattern.c
===================================================================
RCS file: /cvs/Scribus/scribus/art_render_pattern.c,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 art_render_pattern.c
--- scribus/art_render_pattern.c	14 Nov 2004 16:12:43 -0000	1.2.2.1
+++ scribus/art_render_pattern.c	3 Jul 2005 18:27:08 -0000
@@ -21,13 +21,7 @@
  *
  */
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
  
 #include "art_render_pattern.h"
 
Index: scribus/art_rgb.c
===================================================================
RCS file: /cvs/Scribus/scribus/art_rgb.c,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 art_rgb.c
--- scribus/art_rgb.c	6 Mar 2005 13:16:21 -0000	1.2.2.2
+++ scribus/art_rgb.c	3 Jul 2005 18:27:08 -0000
@@ -17,13 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 #include "art_rgb.h"
 
Index: scribus/art_rgb_affine_private.c
===================================================================
RCS file: /cvs/Scribus/scribus/art_rgb_affine_private.c,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 art_rgb_affine_private.c
--- scribus/art_rgb_affine_private.c	14 Nov 2004 16:12:43 -0000	1.2.2.1
+++ scribus/art_rgb_affine_private.c	3 Jul 2005 18:27:08 -0000
@@ -17,13 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 #include "art_rgb_affine_private.h"
 
Index: scribus/art_rgb_svp.c
===================================================================
RCS file: /cvs/Scribus/scribus/art_rgb_svp.c,v
retrieving revision 1.3.2.1
diff -u -r1.3.2.1 art_rgb_svp.c
--- scribus/art_rgb_svp.c	14 Nov 2004 16:12:43 -0000	1.3.2.1
+++ scribus/art_rgb_svp.c	3 Jul 2005 18:27:08 -0000
@@ -19,13 +19,7 @@
 
 /* Render a sorted vector path into an RGB buffer. */
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 #include "art_rgb_svp.h"
 
Index: scribus/art_rgba_affine.c
===================================================================
RCS file: /cvs/Scribus/scribus/art_rgba_affine.c,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 art_rgba_affine.c
--- scribus/art_rgba_affine.c	14 Nov 2004 16:12:43 -0000	1.2.2.1
+++ scribus/art_rgba_affine.c	3 Jul 2005 18:27:08 -0000
@@ -17,13 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 #include "art_rgba_affine.h"
 
Index: scribus/charselect.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/Attic/charselect.cpp,v
retrieving revision 1.1.2.24
diff -u -r1.1.2.24 charselect.cpp
--- scribus/charselect.cpp	2 Jul 2005 07:42:27 -0000	1.1.2.24
+++ scribus/charselect.cpp	3 Jul 2005 18:27:08 -0000
@@ -17,13 +17,9 @@
 #include "charselect.moc"
 #include "scpainter.h"
 #include "pluginmanager.h"
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+
+#include "scconfig.h"
+
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_OUTLINE_H
Index: scribus/cmykcolor.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/cmykcolor.cpp,v
retrieving revision 1.5.2.5
diff -u -r1.5.2.5 cmykcolor.cpp
--- scribus/cmykcolor.cpp	28 Mar 2005 20:27:24 -0000	1.5.2.5
+++ scribus/cmykcolor.cpp	3 Jul 2005 18:27:08 -0000
@@ -20,13 +20,7 @@
 
 #include "cmykcolor.h"
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 #ifdef HAVE_CMS
 	#include CMS_INC
Index: scribus/cmykfw.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/cmykfw.cpp,v
retrieving revision 1.16.2.9
diff -u -r1.16.2.9 cmykfw.cpp
--- scribus/cmykfw.cpp	9 May 2005 23:41:20 -0000	1.16.2.9
+++ scribus/cmykfw.cpp	3 Jul 2005 18:27:09 -0000
@@ -7,13 +7,7 @@
 #include <qfileinfo.h>
 #include <qdir.h>
 #include <cstdlib>
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 #include "scpaths.h"
 #ifdef HAVE_CMS
 extern bool SoftProofing;
Index: scribus/colorm.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/colorm.cpp,v
retrieving revision 1.32.2.12
diff -u -r1.32.2.12 colorm.cpp
--- scribus/colorm.cpp	20 Apr 2005 21:20:16 -0000	1.32.2.12
+++ scribus/colorm.cpp	3 Jul 2005 18:27:09 -0000
@@ -22,13 +22,7 @@
 #include "prefsfile.h"
 #include "scpaths.h"
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 extern QPixmap loadIcon(QString nam);
 extern ScribusApp* ScApp;
Index: scribus/crypt.h
===================================================================
RCS file: /cvs/Scribus/scribus/crypt.h,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 crypt.h
--- scribus/crypt.h	3 Mar 2005 15:46:08 -0000	1.1.2.1
+++ scribus/crypt.h	3 Jul 2005 18:27:09 -0000
@@ -27,7 +27,7 @@
    Encryption is not supported.
 */
 
-#include "config.h"
+#include "scconfig.h"
 
 #define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
 
Index: scribus/cupsoptions.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/cupsoptions.cpp,v
retrieving revision 1.16.2.2
diff -u -r1.16.2.2 cupsoptions.cpp
--- scribus/cupsoptions.cpp	9 Jun 2005 00:07:01 -0000	1.16.2.2
+++ scribus/cupsoptions.cpp	3 Jul 2005 18:27:09 -0000
@@ -19,13 +19,7 @@
 #include "cupsoptions.moc"
 #include "prefsfile.h"
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 #include <qstringlist.h>
 #ifdef HAVE_CUPS
Index: scribus/druck.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/druck.cpp,v
retrieving revision 1.32.2.5
diff -u -r1.32.2.5 druck.cpp
--- scribus/druck.cpp	19 Jun 2005 18:07:09 -0000	1.32.2.5
+++ scribus/druck.cpp	3 Jul 2005 18:27:09 -0000
@@ -9,13 +9,7 @@
 #include "druck.h"
 #include "druck.moc"
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 #include "prefsfile.h"
 #include "customfdialog.h"
Index: scribus/fileloader.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/Attic/fileloader.cpp,v
retrieving revision 1.1.2.100
diff -u -r1.1.2.100 fileloader.cpp
--- scribus/fileloader.cpp	19 Jun 2005 17:33:56 -0000	1.1.2.100
+++ scribus/fileloader.cpp	3 Jul 2005 18:27:09 -0000
@@ -19,13 +19,7 @@
 #include "units.h"
 #include "pluginmanager.h"
 #include "pagestructs.h"
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 #ifdef HAVE_LIBZ
 	#include <zlib.h>
 #endif
Index: scribus/fileunzip.h
===================================================================
RCS file: /cvs/Scribus/scribus/fileunzip.h,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 fileunzip.h
--- scribus/fileunzip.h	3 Mar 2005 15:46:08 -0000	1.1.2.1
+++ scribus/fileunzip.h	3 Jul 2005 18:27:09 -0000
@@ -21,7 +21,7 @@
 #ifndef FILEUNZIP_H
 #define FILEUNZIP_H
 
-#include "config.h"
+#include "scconfig.h"
 
 #include <zlib.h>
 #include <qstring.h>
Index: scribus/fontprefs.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/fontprefs.cpp,v
retrieving revision 1.24.2.13
diff -u -r1.24.2.13 fontprefs.cpp
--- scribus/fontprefs.cpp	18 Jun 2005 17:19:15 -0000	1.24.2.13
+++ scribus/fontprefs.cpp	3 Jul 2005 18:27:09 -0000
@@ -10,13 +10,7 @@
 #include "scribus.h"
 #include "scribusdoc.h"
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 extern QPixmap loadIcon(QString nam);
 extern PrefsFile* prefsFile;
Index: scribus/gtgettext.h
===================================================================
RCS file: /cvs/Scribus/scribus/gtgettext.h,v
retrieving revision 1.2.2.6
diff -u -r1.2.2.6 gtgettext.h
--- scribus/gtgettext.h	28 Mar 2005 12:41:21 -0000	1.2.2.6
+++ scribus/gtgettext.h	3 Jul 2005 18:27:09 -0000
@@ -31,7 +31,7 @@
 #include <qstring.h>
 #include <qstringlist.h>
 
-#include "config.h"
+#include "scconfig.h"
 #include "gtdialogs.h"
 #include "gtwriter.h"
 #include "scfonts.h"
Index: scribus/helpbrowser.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/helpbrowser.cpp,v
retrieving revision 1.13.2.27
diff -u -r1.13.2.27 helpbrowser.cpp
--- scribus/helpbrowser.cpp	1 Jul 2005 16:51:38 -0000	1.13.2.27
+++ scribus/helpbrowser.cpp	3 Jul 2005 18:27:09 -0000
@@ -58,13 +58,7 @@
 
 #include "scpaths.h"
 
-#ifdef _MSC_VER
-#if (_MSC_VER >= 1200)
-#include "win-config.h"
-#endif
-#else
-#include "config.h"
-#endif
+#include "scconfig.h"
 
 extern QPixmap loadIcon(QString nam);
 
Index: scribus/hyphenator.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/hyphenator.cpp,v
retrieving revision 1.15.2.11
diff -u -r1.15.2.11 hyphenator.cpp
--- scribus/hyphenator.cpp	30 Jun 2005 21:57:01 -0000	1.15.2.11
+++ scribus/hyphenator.cpp	3 Jul 2005 18:27:09 -0000
@@ -18,13 +18,7 @@
 #include "hyphenator.moc"
 #include "hyask.h"
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 #include <qregexp.h>
 #include <qcursor.h>
Index: scribus/ioapi.c
===================================================================
RCS file: /cvs/Scribus/scribus/ioapi.c,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 ioapi.c
--- scribus/ioapi.c	3 Mar 2005 15:46:08 -0000	1.1.2.1
+++ scribus/ioapi.c	3 Jul 2005 18:27:09 -0000
@@ -6,7 +6,7 @@
    Copyright (C) 1998-2004 Gilles Vollant
 */
 
-#include "config.h"
+#include "scconfig.h"
 
 #include <stdio.h>
 #include <stdlib.h>
Index: scribus/ioapi.h
===================================================================
RCS file: /cvs/Scribus/scribus/ioapi.h,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 ioapi.h
--- scribus/ioapi.h	3 Mar 2005 15:46:08 -0000	1.1.2.1
+++ scribus/ioapi.h	3 Jul 2005 18:27:09 -0000
@@ -6,7 +6,7 @@
    Copyright (C) 1998-2004 Gilles Vollant
 */
 
-#include "config.h"
+#include "scconfig.h"
 
 #ifndef _ZLIBIOAPI_H
 #define _ZLIBIOAPI_H
Index: scribus/langmgr.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/Attic/langmgr.cpp,v
retrieving revision 1.1.2.11
diff -u -r1.1.2.11 langmgr.cpp
--- scribus/langmgr.cpp	25 Apr 2005 14:49:42 -0000	1.1.2.11
+++ scribus/langmgr.cpp	3 Jul 2005 18:27:09 -0000
@@ -21,7 +21,7 @@
 #include <qobject.h>
 #include <qstringlist.h> 
 
-#include "config.h"
+#include "scconfig.h"
 #include "langmgr.h"
 #include "scpaths.h"
 
Index: scribus/main.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/main.cpp,v
retrieving revision 1.16.2.18
diff -u -r1.16.2.18 main.cpp
--- scribus/main.cpp	1 Jul 2005 19:43:18 -0000	1.16.2.18
+++ scribus/main.cpp	3 Jul 2005 18:27:09 -0000
@@ -29,13 +29,7 @@
 #include "scribusapp.h"
 #include "scribus.h"
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 int mainApp(int argc, char **argv);
 void initCrashHandler();
Index: scribus/md5.c
===================================================================
RCS file: /cvs/Scribus/scribus/md5.c,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 md5.c
--- scribus/md5.c	14 Nov 2004 16:12:45 -0000	1.2.2.1
+++ scribus/md5.c	3 Jul 2005 18:27:09 -0000
@@ -21,13 +21,7 @@
 /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.  */
 
 #ifdef HAVE_CONFIG_H
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 #endif
 
 #include <sys/types.h>
Index: scribus/mergedoc.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/mergedoc.cpp,v
retrieving revision 1.14.2.7
diff -u -r1.14.2.7 mergedoc.cpp
--- scribus/mergedoc.cpp	9 Jun 2005 00:07:01 -0000	1.14.2.7
+++ scribus/mergedoc.cpp	3 Jul 2005 18:27:09 -0000
@@ -17,13 +17,7 @@
 #include "scribusXml.h"
 #include "prefsfile.h"
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 #include <qcursor.h>
 
Index: scribus/pageitem.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/pageitem.cpp,v
retrieving revision 1.121.2.178
diff -u -r1.121.2.178 pageitem.cpp
--- scribus/pageitem.cpp	29 Jun 2005 19:19:41 -0000	1.121.2.178
+++ scribus/pageitem.cpp	3 Jul 2005 18:27:09 -0000
@@ -37,13 +37,7 @@
 #include "mpalette.h"
 #include "serializer.h"
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 #include <ft2build.h>
 #include FT_GLYPH_H
Index: scribus/pdfopts.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/pdfopts.cpp,v
retrieving revision 1.33.2.19
diff -u -r1.33.2.19 pdfopts.cpp
--- scribus/pdfopts.cpp	19 Jun 2005 17:49:37 -0000	1.33.2.19
+++ scribus/pdfopts.cpp	3 Jul 2005 18:27:10 -0000
@@ -15,13 +15,7 @@
 #include "pdfoptions.h"
 #include "util.h"
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 extern ProfilesL InputProfiles;
 #ifdef HAVE_CMS
Index: scribus/pluginmanager.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/Attic/pluginmanager.cpp,v
retrieving revision 1.1.2.17
diff -u -r1.1.2.17 pluginmanager.cpp
--- scribus/pluginmanager.cpp	2 Jul 2005 09:21:18 -0000	1.1.2.17
+++ scribus/pluginmanager.cpp	3 Jul 2005 18:27:10 -0000
@@ -3,13 +3,7 @@
 
 #include <qdir.h>
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 #include "scribus.h"
 #include "scribusapp.h"
Index: scribus/scfonts.h
===================================================================
RCS file: /cvs/Scribus/scribus/scfonts.h,v
retrieving revision 1.4.2.7
diff -u -r1.4.2.7 scfonts.h
--- scribus/scfonts.h	18 Jun 2005 12:36:12 -0000	1.4.2.7
+++ scribus/scfonts.h	3 Jul 2005 18:27:10 -0000
@@ -13,7 +13,7 @@
 #include FT_GLYPH_H
 // #include <qpixmap.h>
 #include "fpointarray.h"
-#include "config.h"
+#include "scconfig.h"
 
 // #include "scfonts_encoding.h"
 
Index: scribus/scfonts_ttf.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/scfonts_ttf.cpp,v
retrieving revision 1.12.2.11
diff -u -r1.12.2.11 scfonts_ttf.cpp
--- scribus/scfonts_ttf.cpp	19 Jun 2005 16:48:42 -0000	1.12.2.11
+++ scribus/scfonts_ttf.cpp	3 Jul 2005 18:27:10 -0000
@@ -8,13 +8,7 @@
 #include "scfonts_ttf.h"
 #include "scfontmetrics.h"
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
Index: scribus/scimage.h
===================================================================
RCS file: /cvs/Scribus/scribus/Attic/scimage.h,v
retrieving revision 1.1.2.11
diff -u -r1.1.2.11 scimage.h
--- scribus/scimage.h	5 May 2005 10:02:52 -0000	1.1.2.11
+++ scribus/scimage.h	3 Jul 2005 18:27:10 -0000
@@ -1,13 +1,7 @@
 #ifndef SCIMAGE_H
 #define SCIMAGE_H
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 #include <setjmp.h>
 #include <cstdlib>
Index: scribus/scpainter.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/scpainter.cpp,v
retrieving revision 1.19.2.10
diff -u -r1.19.2.10 scpainter.cpp
--- scribus/scpainter.cpp	22 Apr 2005 22:41:57 -0000	1.19.2.10
+++ scribus/scpainter.cpp	3 Jul 2005 18:27:10 -0000
@@ -21,13 +21,7 @@
 
 #include "scpainter.h"
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 #include <qpaintdevice.h>
 #include <qpixmap.h>
Index: scribus/scpaths.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/Attic/scpaths.cpp,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 scpaths.cpp
--- scribus/scpaths.cpp	3 Jul 2005 00:21:32 -0000	1.1.2.3
+++ scribus/scpaths.cpp	3 Jul 2005 18:27:10 -0000
@@ -1,13 +1,7 @@
 #include "scpaths.h"
 #include <qapplication.h>
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 
 // On Qt/Mac we need CoreFoundation to discover the location
Index: scribus/scribus.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/scribus.cpp,v
retrieving revision 1.228.2.409
diff -u -r1.228.2.409 scribus.cpp
--- scribus/scribus.cpp	3 Jul 2005 11:31:17 -0000	1.228.2.409
+++ scribus/scribus.cpp	3 Jul 2005 18:27:10 -0000
@@ -34,13 +34,7 @@
 #include <cstdlib>
 #include <cmath>
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 #ifdef HAVE_DLFCN_H
 #include <dlfcn.h>
Index: scribus/scribusXml.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/scribusXml.cpp,v
retrieving revision 1.83.2.121
diff -u -r1.83.2.121 scribusXml.cpp
--- scribus/scribusXml.cpp	3 Jul 2005 11:31:17 -0000	1.83.2.121
+++ scribus/scribusXml.cpp	3 Jul 2005 18:27:10 -0000
@@ -26,13 +26,7 @@
 
 #include <iostream>
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 #ifdef HAVE_LIBZ
 #include <zlib.h>
Index: scribus/scribusdoc.h
===================================================================
RCS file: /cvs/Scribus/scribus/scribusdoc.h,v
retrieving revision 1.49.2.51
diff -u -r1.49.2.51 scribusdoc.h
--- scribus/scribusdoc.h	13 Jun 2005 23:34:36 -0000	1.49.2.51
+++ scribus/scribusdoc.h	3 Jul 2005 18:27:10 -0000
@@ -17,7 +17,7 @@
 #ifndef SCRIBUSDOC_H
 #define SCRIBUSDOC_H
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "scconfig.h"
 #endif
 // include files for QT
 #include <qobject.h>
Index: scribus/scribusstructs.h
===================================================================
RCS file: /cvs/Scribus/scribus/Attic/scribusstructs.h,v
retrieving revision 1.1.2.69
diff -u -r1.1.2.69 scribusstructs.h
--- scribus/scribusstructs.h	29 Jun 2005 19:19:41 -0000	1.1.2.69
+++ scribus/scribusstructs.h	3 Jul 2005 18:27:10 -0000
@@ -2,7 +2,7 @@
 #define SCRIBUSSTRUCTS_H
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "scconfig.h"
 #endif
 
 #include <qvaluestack.h>
Index: scribus/scribusview.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/scribusview.cpp,v
retrieving revision 1.76.2.229
diff -u -r1.76.2.229 scribusview.cpp
--- scribus/scribusview.cpp	2 Jul 2005 14:30:18 -0000	1.76.2.229
+++ scribus/scribusview.cpp	3 Jul 2005 18:27:10 -0000
@@ -18,13 +18,7 @@
 #include "scribusview.h"
 #include "scribusview.moc"
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 #include <qcolor.h>
 #include <qfont.h>
Index: scribus/tabpdfoptions.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/Attic/tabpdfoptions.cpp,v
retrieving revision 1.1.2.23
diff -u -r1.1.2.23 tabpdfoptions.cpp
--- scribus/tabpdfoptions.cpp	28 Jun 2005 11:08:32 -0000	1.1.2.23
+++ scribus/tabpdfoptions.cpp	3 Jul 2005 18:27:10 -0000
@@ -13,13 +13,7 @@
 #include "units.h"
 #include "pdfoptions.h"
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 extern QPixmap loadIcon(QString nam);
 extern ProfilesL InputProfiles;
Index: scribus/undomanager.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/Attic/undomanager.cpp,v
retrieving revision 1.1.2.74
diff -u -r1.1.2.74 undomanager.cpp
--- scribus/undomanager.cpp	29 Jun 2005 21:41:22 -0000	1.1.2.74
+++ scribus/undomanager.cpp	3 Jul 2005 18:27:10 -0000
@@ -21,7 +21,7 @@
 #include "undomanager.h"
 #include "undomanager.moc"
 #include "undogui.h"
-#include "config.h"
+#include "scconfig.h"
 #include "prefscontext.h"
 #include "prefsfile.h"
 #include <qvaluelist.h>
Index: scribus/unzip.c
===================================================================
RCS file: /cvs/Scribus/scribus/unzip.c,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 unzip.c
--- scribus/unzip.c	3 Mar 2005 15:46:08 -0000	1.1.2.1
+++ scribus/unzip.c	3 Jul 2005 18:27:10 -0000
@@ -34,7 +34,7 @@
   version without encryption capabilities).
  */
 
-#include "config.h"
+#include "scconfig.h"
 
 #include <stdio.h>
 #include <stdlib.h>
Index: scribus/unzip.h
===================================================================
RCS file: /cvs/Scribus/scribus/unzip.h,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 unzip.h
--- scribus/unzip.h	3 Mar 2005 15:46:08 -0000	1.1.2.1
+++ scribus/unzip.h	3 Jul 2005 18:27:10 -0000
@@ -40,7 +40,7 @@
       ftp://ftp.pkware.com/probdesc.zip
 */
 
-#include "config.h"
+#include "scconfig.h"
 
 #ifndef _unz_H
 #define _unz_H
Index: scribus/util.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/util.cpp,v
retrieving revision 1.52.2.91
diff -u -r1.52.2.91 util.cpp
--- scribus/util.cpp	2 Jul 2005 09:23:35 -0000	1.52.2.91
+++ scribus/util.cpp	3 Jul 2005 18:27:10 -0000
@@ -37,13 +37,7 @@
 #include "prefscontext.h"
 #include "prefstable.h"
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 extern PrefsFile *prefsFile;
 
Index: scribus/libpdf/pdflib.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/libpdf/pdflib.cpp,v
retrieving revision 1.78.2.108
diff -u -r1.78.2.108 pdflib.cpp
--- scribus/libpdf/pdflib.cpp	2 Jul 2005 09:38:28 -0000	1.78.2.108
+++ scribus/libpdf/pdflib.cpp	3 Jul 2005 18:27:08 -0000
@@ -18,13 +18,7 @@
 #include "pdflib.h"
 #include "pdflib.moc"
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 #include <qstring.h>
 #include <qrect.h>
Index: scribus/libpostscript/pslib.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/libpostscript/pslib.cpp,v
retrieving revision 1.24.2.75
diff -u -r1.24.2.75 pslib.cpp
--- scribus/libpostscript/pslib.cpp	19 Jun 2005 18:07:09 -0000	1.24.2.75
+++ scribus/libpostscript/pslib.cpp	3 Jul 2005 18:27:08 -0000
@@ -23,13 +23,7 @@
 #include <cstdlib>
 #include <qregexp.h>
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 #include "pslib.h"
 #include "scribusdoc.h"
Index: scribus/pixbuf/gdk-pixbuf-xlib-drawable.c
===================================================================
RCS file: /cvs/Scribus/scribus/pixbuf/Attic/gdk-pixbuf-xlib-drawable.c,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 gdk-pixbuf-xlib-drawable.c
--- scribus/pixbuf/gdk-pixbuf-xlib-drawable.c	13 Mar 2005 11:14:22 -0000	1.1.2.1
+++ scribus/pixbuf/gdk-pixbuf-xlib-drawable.c	3 Jul 2005 18:30:01 -0000
@@ -26,7 +26,7 @@
 /* Ported to Xlib by John Harper <john@dcs.warwick.ac.uk> */
 
 
-#include <config.h>
+#include "scconfig.h"
 #include <stdio.h>
 #include <string.h>
 #include "gdk-pixbuf-xlib-private.h"
Index: scribus/pixbuf/gdk-pixbuf-xlib-private.h
===================================================================
RCS file: /cvs/Scribus/scribus/pixbuf/Attic/gdk-pixbuf-xlib-private.h,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 gdk-pixbuf-xlib-private.h
--- scribus/pixbuf/gdk-pixbuf-xlib-private.h	13 Mar 2005 11:14:22 -0000	1.1.2.1
+++ scribus/pixbuf/gdk-pixbuf-xlib-private.h	3 Jul 2005 18:30:01 -0000
@@ -21,7 +21,7 @@
 #ifndef GDK_PIXBUF_XLIB_PRIVATE_H
 #define GDK_PIXBUF_XLIB_PRIVATE_H
 
-#include <config.h>
+#include "scconfig.h"
 #include "gdk-pixbuf-xlib.h"
 #include <X11/Xlib.h>
 
Index: scribus/pixbuf/gdk-pixbuf-xlib-render.c
===================================================================
RCS file: /cvs/Scribus/scribus/pixbuf/Attic/gdk-pixbuf-xlib-render.c,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 gdk-pixbuf-xlib-render.c
--- scribus/pixbuf/gdk-pixbuf-xlib-render.c	13 Mar 2005 11:14:22 -0000	1.1.2.1
+++ scribus/pixbuf/gdk-pixbuf-xlib-render.c	3 Jul 2005 18:30:01 -0000
@@ -22,7 +22,7 @@
 
 /* Trivially ported to Xlib(RGB) by John Harper. */
 
-#include <config.h>
+#include "scconfig.h"
 /* #include "gdk-pixbuf-private.h" */
 #include "gdk-pixbuf-xlib-private.h"
 
Index: scribus/pixbuf/gdk-pixbuf-xlib.c
===================================================================
RCS file: /cvs/Scribus/scribus/pixbuf/Attic/gdk-pixbuf-xlib.c,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 gdk-pixbuf-xlib.c
--- scribus/pixbuf/gdk-pixbuf-xlib.c	13 Mar 2005 11:14:22 -0000	1.1.2.1
+++ scribus/pixbuf/gdk-pixbuf-xlib.c	3 Jul 2005 18:30:01 -0000
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "scconfig.h"
 #include <X11/Xlib.h>
 /*#include <gdk-pixbuf/gdk-pixbuf-private.h>*/
 #include "gdk-pixbuf-xlib-private.h"
Index: scribus/pixbuf/gdk-pixbuf-xlibrgb.c
===================================================================
RCS file: /cvs/Scribus/scribus/pixbuf/Attic/gdk-pixbuf-xlibrgb.c,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 gdk-pixbuf-xlibrgb.c
--- scribus/pixbuf/gdk-pixbuf-xlibrgb.c	13 Mar 2005 11:14:22 -0000	1.1.2.1
+++ scribus/pixbuf/gdk-pixbuf-xlibrgb.c	3 Jul 2005 18:30:01 -0000
@@ -50,7 +50,7 @@
 #include <math.h>
 
 #if HAVE_CONFIG_H
-#  include <config.h>
+#  include "scconfig.h"
 #  if STDC_HEADERS
 #    include <stdio.h>
 #    include <stdlib.h>
Index: scribus/plugins/fileloader/oodraw/oodrawimp.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/plugins/fileloader/oodraw/oodrawimp.cpp,v
retrieving revision 1.1.2.36
diff -u -r1.1.2.36 oodrawimp.cpp
--- scribus/plugins/fileloader/oodraw/oodrawimp.cpp	19 Jun 2005 16:48:43 -0000	1.1.2.36
+++ scribus/plugins/fileloader/oodraw/oodrawimp.cpp	3 Jul 2005 18:30:01 -0000
@@ -10,13 +10,8 @@
 
 #include "oodrawimp.h"
 #include "oodrawimp.moc"
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+
+#include "scconfig.h"
 
 #include "scribus.h"
 #include "scribusdoc.h"
Index: scribus/plugins/gettext/htmlim/htmlim.h
===================================================================
RCS file: /cvs/Scribus/scribus/plugins/gettext/htmlim/htmlim.h,v
retrieving revision 1.3.2.4
diff -u -r1.3.2.4 htmlim.h
--- scribus/plugins/gettext/htmlim/htmlim.h	14 Jan 2005 23:40:45 -0000	1.3.2.4
+++ scribus/plugins/gettext/htmlim/htmlim.h	3 Jul 2005 18:30:01 -0000
@@ -23,7 +23,7 @@
 
 #include "gtwriter.h"
 
-#include "config.h"
+#include "scconfig.h"
 
 extern "C" void GetText(QString filename, QString encoding, bool textOnly, gtWriter *writer);
 
Index: scribus/plugins/gettext/htmlim/htmlreader.h
===================================================================
RCS file: /cvs/Scribus/scribus/plugins/gettext/htmlim/htmlreader.h,v
retrieving revision 1.3.2.1
diff -u -r1.3.2.1 htmlreader.h
--- scribus/plugins/gettext/htmlim/htmlreader.h	14 Jan 2005 23:40:45 -0000	1.3.2.1
+++ scribus/plugins/gettext/htmlim/htmlreader.h	3 Jul 2005 18:30:01 -0000
@@ -20,7 +20,7 @@
 #ifndef HTMLREADER_H
 #define HTMLREADER_H
 
-#include "config.h"
+#include "scconfig.h"
 
 #ifdef HAVE_XML
 
Index: scribus/plugins/gettext/odtim/contentreader.h
===================================================================
RCS file: /cvs/Scribus/scribus/plugins/gettext/odtim/contentreader.h,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 contentreader.h
--- scribus/plugins/gettext/odtim/contentreader.h	17 May 2005 14:51:03 -0000	1.1.2.2
+++ scribus/plugins/gettext/odtim/contentreader.h	3 Jul 2005 18:30:01 -0000
@@ -21,7 +21,7 @@
 #ifndef CONTENTREADER_H
 #define CONTENTREADER_H
 
-#include "config.h"
+#include "scconfig.h"
 
 #ifdef HAVE_XML
 
Index: scribus/plugins/gettext/odtim/odtdia.h
===================================================================
RCS file: /cvs/Scribus/scribus/plugins/gettext/odtim/odtdia.h,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 odtdia.h
--- scribus/plugins/gettext/odtim/odtdia.h	3 Mar 2005 15:54:21 -0000	1.1.2.1
+++ scribus/plugins/gettext/odtim/odtdia.h	3 Jul 2005 18:30:01 -0000
@@ -21,7 +21,7 @@
 #ifndef ODTDIA_H
 #define ODTDIA_H
 
-#include "config.h"
+#include "scconfig.h"
 
 #ifdef HAVE_XML
 
Index: scribus/plugins/gettext/odtim/odtim.h
===================================================================
RCS file: /cvs/Scribus/scribus/plugins/gettext/odtim/odtim.h,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 odtim.h
--- scribus/plugins/gettext/odtim/odtim.h	3 Mar 2005 15:54:21 -0000	1.1.2.1
+++ scribus/plugins/gettext/odtim/odtim.h	3 Jul 2005 18:30:01 -0000
@@ -23,7 +23,7 @@
 
 #include <qstring.h>
 #include <gtwriter.h>
-#include "config.h"
+#include "scconfig.h"
 
 extern "C" void GetText(QString filename, QString encoding, bool textOnly, gtWriter *writer);
 
Index: scribus/plugins/gettext/odtim/stylereader.h
===================================================================
RCS file: /cvs/Scribus/scribus/plugins/gettext/odtim/stylereader.h,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 stylereader.h
--- scribus/plugins/gettext/odtim/stylereader.h	17 May 2005 14:51:03 -0000	1.1.2.2
+++ scribus/plugins/gettext/odtim/stylereader.h	3 Jul 2005 18:30:01 -0000
@@ -21,7 +21,7 @@
 #ifndef STYLEREADER_H
 #define STYLEREADER_H
 
-#include "config.h"
+#include "scconfig.h"
 
 #ifdef HAVE_XML
 
Index: scribus/plugins/gettext/sxwim/contentreader.h
===================================================================
RCS file: /cvs/Scribus/scribus/plugins/gettext/sxwim/contentreader.h,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 contentreader.h
--- scribus/plugins/gettext/sxwim/contentreader.h	11 Jan 2005 02:14:45 -0000	1.2.2.1
+++ scribus/plugins/gettext/sxwim/contentreader.h	3 Jul 2005 18:30:00 -0000
@@ -21,7 +21,7 @@
 #ifndef CONTENTREADER_H
 #define CONTENTREADER_H
 
-#include "config.h"
+#include "scconfig.h"
 
 #ifdef HAVE_XML
 
Index: scribus/plugins/gettext/sxwim/stylereader.h
===================================================================
RCS file: /cvs/Scribus/scribus/plugins/gettext/sxwim/stylereader.h,v
retrieving revision 1.4.2.1
diff -u -r1.4.2.1 stylereader.h
--- scribus/plugins/gettext/sxwim/stylereader.h	11 Jan 2005 02:14:45 -0000	1.4.2.1
+++ scribus/plugins/gettext/sxwim/stylereader.h	3 Jul 2005 18:30:00 -0000
@@ -21,7 +21,7 @@
 #ifndef STYLEREADER_H
 #define STYLEREADER_H
 
-#include "config.h"
+#include "scconfig.h"
 
 #ifdef HAVE_XML
 
Index: scribus/plugins/gettext/sxwim/sxwdia.h
===================================================================
RCS file: /cvs/Scribus/scribus/plugins/gettext/sxwim/sxwdia.h,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 sxwdia.h
--- scribus/plugins/gettext/sxwim/sxwdia.h	11 Jan 2005 02:14:45 -0000	1.2.2.1
+++ scribus/plugins/gettext/sxwim/sxwdia.h	3 Jul 2005 18:30:01 -0000
@@ -1,7 +1,7 @@
 #ifndef SXWDIA_H
 #define SXWDIA_H
 
-#include "config.h"
+#include "scconfig.h"
 
 #ifdef HAVE_XML
 
Index: scribus/plugins/gettext/sxwim/sxwim.h
===================================================================
RCS file: /cvs/Scribus/scribus/plugins/gettext/sxwim/sxwim.h,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 sxwim.h
--- scribus/plugins/gettext/sxwim/sxwim.h	11 Jan 2005 02:14:45 -0000	1.1.2.3
+++ scribus/plugins/gettext/sxwim/sxwim.h	3 Jul 2005 18:30:01 -0000
@@ -23,7 +23,7 @@
 
 #include <qstring.h>
 #include <gtwriter.h>
-#include "config.h"
+#include "scconfig.h"
 
 extern "C" void GetText(QString filename, QString encoding, bool textOnly, gtWriter *writer);
 
Index: scribus/plugins/newfromtemplateplugin/nftdialog.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/plugins/newfromtemplateplugin/nftdialog.cpp,v
retrieving revision 1.8.2.2
diff -u -r1.8.2.2 nftdialog.cpp
--- scribus/plugins/newfromtemplateplugin/nftdialog.cpp	4 May 2005 23:27:10 -0000	1.8.2.2
+++ scribus/plugins/newfromtemplateplugin/nftdialog.cpp	3 Jul 2005 18:30:01 -0000
@@ -3,7 +3,7 @@
  ***************************************************************************/
 #include "nftdialog.h"
 #include "nftdialog.moc"
-#include "config.h"
+#include "scconfig.h"
 
 extern QPixmap loadIcon(QString nam);
 
Index: scribus/plugins/newfromtemplateplugin/nftsettings.h
===================================================================
RCS file: /cvs/Scribus/scribus/plugins/newfromtemplateplugin/nftsettings.h,v
retrieving revision 1.3.2.1
diff -u -r1.3.2.1 nftsettings.h
--- scribus/plugins/newfromtemplateplugin/nftsettings.h	14 Jan 2005 23:40:45 -0000	1.3.2.1
+++ scribus/plugins/newfromtemplateplugin/nftsettings.h	3 Jul 2005 18:30:01 -0000
@@ -4,7 +4,7 @@
 #ifndef NFTSETTINGS_H
 #define NFTSETTINGS_H
 
-#include "config.h"
+#include "scconfig.h"
 #include <vector>
 #include <qstring.h>
 #include <qdir.h>
Index: scribus/plugins/psimport/importps.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/plugins/psimport/importps.cpp,v
retrieving revision 1.7.2.22
diff -u -r1.7.2.22 importps.cpp
--- scribus/plugins/psimport/importps.cpp	19 Jun 2005 16:48:43 -0000	1.7.2.22
+++ scribus/plugins/psimport/importps.cpp	3 Jul 2005 18:30:01 -0000
@@ -1,12 +1,8 @@
 #include "importps.h"
 #include "importps.moc"
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+
+#include "scconfig.h"
+
 #include "customfdialog.h"
 #include "mpalette.h"
 #include "prefsfile.h"
Index: scribus/plugins/scriptplugin/scriptplugin.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp,v
retrieving revision 1.33.2.66
diff -u -r1.33.2.66 scriptplugin.cpp
--- scribus/plugins/scriptplugin/scriptplugin.cpp	30 Jun 2005 18:26:24 -0000	1.33.2.66
+++ scribus/plugins/scriptplugin/scriptplugin.cpp	3 Jul 2005 18:30:01 -0000
@@ -48,14 +48,7 @@
 #include "scpaths.h"
 #include "units.h"
 
-
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 #include <qapplication.h>
 #include <qmessagebox.h>
Index: scribus/plugins/short-words/configuration.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/plugins/short-words/configuration.cpp,v
retrieving revision 1.1.2.5
diff -u -r1.1.2.5 configuration.cpp
--- scribus/plugins/short-words/configuration.cpp	15 Apr 2005 12:08:27 -0000	1.1.2.5
+++ scribus/plugins/short-words/configuration.cpp	3 Jul 2005 18:30:00 -0000
@@ -12,7 +12,7 @@
 or documentation
 */
 
-#include "config.h"
+#include "scconfig.h"
 #include "configuration.h"
 #include "configuration.moc"
 #include "version.h"
Index: scribus/plugins/short-words/shortwords.h
===================================================================
RCS file: /cvs/Scribus/scribus/plugins/short-words/shortwords.h,v
retrieving revision 1.1.2.4
diff -u -r1.1.2.4 shortwords.h
--- scribus/plugins/short-words/shortwords.h	26 Feb 2005 18:09:02 -0000	1.1.2.4
+++ scribus/plugins/short-words/shortwords.h	3 Jul 2005 18:30:00 -0000
@@ -12,7 +12,7 @@
 #ifndef _SCRIBUS_SHORTWORDS_H_
 #define _SCRIBUS_SHORTWORDS_H_
 
-#include "config.h"
+#include "scconfig.h"
 #include "configuration.h"
 #include "parse.h"
 #include "vlnadialog.h"
Index: scribus/plugins/svgexplugin/svgexplugin.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp,v
retrieving revision 1.25.2.20
diff -u -r1.25.2.20 svgexplugin.cpp
--- scribus/plugins/svgexplugin/svgexplugin.cpp	19 Jun 2005 17:49:37 -0000	1.25.2.20
+++ scribus/plugins/svgexplugin/svgexplugin.cpp	3 Jul 2005 18:30:01 -0000
@@ -21,13 +21,7 @@
 #include "svgexplugin.h"
 #include "svgexplugin.moc"
 
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+#include "scconfig.h"
 
 #include "customfdialog.h"
 #include "scribus.h"
Index: scribus/plugins/svgimplugin/svgplugin.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/plugins/svgimplugin/svgplugin.cpp,v
retrieving revision 1.31.2.45
diff -u -r1.31.2.45 svgplugin.cpp
--- scribus/plugins/svgimplugin/svgplugin.cpp	29 Jun 2005 23:57:55 -0000	1.31.2.45
+++ scribus/plugins/svgimplugin/svgplugin.cpp	3 Jul 2005 18:30:01 -0000
@@ -1,12 +1,8 @@
 #include "svgplugin.h"
 #include "svgplugin.moc"
-#ifdef _MSC_VER
- #if (_MSC_VER >= 1200)
-  #include "win-config.h"
- #endif
-#else
- #include "config.h"
-#endif
+
+#include "scconfig.h"
+
 #include "customfdialog.h"
 #include "color.h"
 #include "scribusXml.h"
scconfig_replacement.diff (41,270 bytes)   

jghali

2005-07-03 16:34

administrator   ~0005368

The diff has been uploaded.

ringerc

2005-07-03 17:28

reporter   ~0005369

Great. I'll see if I can get that merged tomorrow. I'm a bit tired to review anything today ... risking keyboard prints.

ringerc

2005-07-05 04:59

reporter   ~0005391

Applied. Thanks for doing that. I've added scconfig.h, tweaked one build failure as a result of the patch ( scribus/pixbuf/ didn't search scribus/ for headers ) and tweaked configure so that the generated config.h will #error unless you included it via scconfig.h .

Issue History

Date Modified Username Field Change
2005-07-02 15:12 jghali New Issue
2005-07-02 17:15 cbradney Note Added: 0005340
2005-07-02 17:34 jghali Note Added: 0005341
2005-07-03 14:08 ringerc Note Added: 0005358
2005-07-03 14:08 ringerc Status new => assigned
2005-07-03 14:08 ringerc Assigned To => ringerc
2005-07-03 14:45 jghali Note Added: 0005359
2005-07-03 14:54 ringerc Note Added: 0005360
2005-07-03 15:08 jghali Note Added: 0005361
2005-07-03 15:08 cbradney Note Added: 0005362
2005-07-03 15:18 jghali Note Added: 0005363
2005-07-03 15:20 cbradney Note Added: 0005364
2005-07-03 15:44 jghali Note Added: 0005366
2005-07-03 15:47 cbradney Note Added: 0005367
2005-07-03 16:34 jghali File Added: scconfig_replacement.diff
2005-07-03 16:34 jghali Note Added: 0005368
2005-07-03 17:28 ringerc Note Added: 0005369
2005-07-05 04:59 ringerc Status assigned => resolved
2005-07-05 04:59 ringerc Resolution open => fixed
2005-07-05 04:59 ringerc Note Added: 0005391
2005-07-05 09:30 cbradney Status resolved => closed
2005-07-05 09:30 cbradney Fixed in Version => 1.3.0cvs
2005-07-06 04:42 ringerc Relationship added child of 0000015