View Issue Details
ID | Project | Category | View Status | Date Submitted | Last Update |
---|---|---|---|---|---|
0002394 | Scribus | Internal | public | 2005-08-05 13:36 | 2005-08-11 21:45 |
Reporter | jghali | Assigned To | cbradney | ||
Priority | normal | Severity | minor | Reproducibility | always |
Status | closed | Resolution | fixed | ||
Platform | Windows | OS | Windows | OS Version | 2000 SP4 |
Product Version | 1.3.1cvs | ||||
Fixed in Version | 1.3.1cvs | ||||
Summary | 0002394: Fix msvc compatibility problem in scribusdoc.cpp | ||||
Description | The attached patch Fix two problems : - functions not returning values - msvc compiler needs full type definition before destructor call( see 2197 ) | ||||
Tags | No tags attached. | ||||
Patch | |||||
2005-08-05 13:36
|
scribusdoc_msvc_compat.diff (773 bytes)
Index: scribusdoc.cpp =================================================================== RCS file: /cvs/Scribus/scribus/scribusdoc.cpp,v retrieving revision 1.25.2.72 diff -u -r1.25.2.72 scribusdoc.cpp --- scribusdoc.cpp 5 Aug 2005 00:15:08 -0000 1.25.2.72 +++ scribusdoc.cpp 5 Aug 2005 13:00:43 -0000 @@ -20,6 +20,7 @@ #include "scribus.h" #include <qfile.h> +#include <qcheckbox.h> #include "page.h" #include "pageitem.h" @@ -1106,6 +1107,7 @@ undoManager->action(this, ss, DocName, Um::ILayer); undoManager->commit(); } + return true; } //TODO: Move raise and lower here @@ -1370,6 +1372,7 @@ Layers[i].Name = newName; } } + return true; } const bool ScribusDoc::layerContainsItems(const int layerNumber) |
|
What line means we need qcheckbox.h in scribusdoc.cpp? |
|
All should be ok apart from that qcheckbox include now in CVS.. Theres no reference to qcheckbox in the code AFAICT so I dont see where it would be needed. Damn POS MSVC is. |
|
The issue happens on template code generation. So the precise line in located in qptrlist.h in function : template<class type> inline void QPtrList<type>::deleteItem( QPtrCollection::Item d ) { if ( del_item ) delete (type *)d; } In Scribus I've found 4 object using QPtrList<QCheckBox> : extimageprops.h(40): QPtrList<QCheckBox> FlagsSicht; layers.h(79): QPtrList<QCheckBox> flagsPrintable; layers.h(80): QPtrList<QCheckBox> flagsVisible; picstatus.h(32): QPtrList<QCheckBox> FlagsPic; layers.h is included line 30 in scribusdoc.cpp and line 223 you see a nice Layers.clear() |
|
Hmmm, mistake on my side, the template code generation is in fact required by mscv 'cause of line 712: ScApp->layerPalette->rebuildList(); The LayerPalette class use some QPtrList<QCheckBox> |
|
Yes, I saw a missing include in layers.h for qcheckbox. The requirement for layers.h in scribusdoc.cpp will probably disappear soon anyway. Please grab CVS and check. |
Date Modified | Username | Field | Change |
---|---|---|---|
2005-08-05 13:36 | jghali | New Issue | |
2005-08-05 13:36 | jghali | File Added: scribusdoc_msvc_compat.diff | |
2005-08-05 17:36 |
|
Relationship added | related to 0002197 |
2005-08-05 17:36 |
|
Relationship added | child of 0000015 |
2005-08-05 19:37 | cbradney | Status | new => assigned |
2005-08-05 19:37 | cbradney | Assigned To | => cbradney |
2005-08-05 19:43 | cbradney | Note Added: 0005905 | |
2005-08-05 20:07 | cbradney | Note Added: 0005907 | |
2005-08-05 20:09 | jghali | Note Added: 0005908 | |
2005-08-05 20:34 | jghali | Note Added: 0005909 | |
2005-08-05 20:44 | cbradney | Note Added: 0005910 | |
2005-08-05 20:49 | cbradney | Status | assigned => resolved |
2005-08-05 20:49 | cbradney | Fixed in Version | => 1.3.1cvs |
2005-08-05 20:49 | cbradney | Resolution | open => fixed |
2005-08-11 21:45 | jghali | Status | resolved => closed |