r25065 by jghali - Code cleanup
scribus-commit
scribus-commit at lists.scribus.net
Sun Mar 27 14:11:57 UTC 2022
Author: jghali
Date: Sun Mar 27 14:11:57 2022
New Revision: 25065
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=25065
Log:
Code cleanup
Modified:
trunk/Scribus/BUILDING_win32_msvc.txt
trunk/Scribus/scribus/scstreamfilter.h
trunk/Scribus/scribus/scstreamfilter_ascii85.h
trunk/Scribus/scribus/scstreamfilter_flate.h
trunk/Scribus/scribus/scstreamfilter_rc4.h
Modified: trunk/Scribus/BUILDING_win32_msvc.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=25065&path=/trunk/Scribus/BUILDING_win32_msvc.txt
==============================================================================
--- trunk/Scribus/BUILDING_win32_msvc.txt (original)
+++ trunk/Scribus/BUILDING_win32_msvc.txt Sun Mar 27 14:11:57 2022
@@ -38,22 +38,20 @@
Archives with ready-to-build solutions for scribus dependencies have been made available on Sourceforge:
https://sourceforge.net/projects/scribus/files/scribus-libs/
-Archives for Visual Studio 2019 and 2022 are provided. These archives can be used to compile all dependencies
-necessary for Scribus. These archives allows to build libraries for 32bit and 64bit platforms using default toolsets.
-The default configuration allows to build binaries compatible with Windows Vista and up.
+Archives containing solutions for Visual Studio 2019 and 2022 are provided. These archives can be used to compile all dependencies
+necessary for Scribus(apart from Qt). These archives allows to build libraries for 32bit and 64bit platforms using default toolsets.
+The default configuration allows to build binaries compatible with Windows 7 and up.
Two different archives are needed :
- scribus-commmon-libs-YYYYMMDD.7z : common libraries for 14x and trunk, no compilation is required here
-- scribus-17x-libs-msvcXXXX-YYYYMMDD.7z : Scribus 17x specific libraries used for current Scribus 1.7.x releases
+- scribus-17x-libs-msvc-YYYYMMDD.7z : Scribus 17x specific libraries used for current Scribus 1.7.x releases
-These archives are named using a scheme where:
-- msvcXXXX represents the Visual Studio version needed to compile provided Visual Studio solution
-- YYYYMMDD represents the date where the archive has been prepared/uploaded to Sourceforge.
+YYYYMMDD represents the date when the archive has been prepared/uploaded to Sourceforge.
Once you downloaded the two appropriate archives :
- decompress them in the *same* directory so as to get a layout similar to this one :
- your_scribus_libs_directory
- |- scribus-1.7.x-libs-msvc2019
+ |- scribus-1.7.x-libs-msvc
|- scribus-common-libs
- open the visual studio solution (*.sln) located in the scribus-1.7.x-libs-* directory
- build debug and release configurations for all platforms (Win32 and/or x64) you plan to execute scribus on
Modified: trunk/Scribus/scribus/scstreamfilter.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=25065&path=/trunk/Scribus/scribus/scstreamfilter.h
==============================================================================
--- trunk/Scribus/scribus/scstreamfilter.h (original)
+++ trunk/Scribus/scribus/scstreamfilter.h Sun Mar 27 14:11:57 2022
@@ -13,7 +13,6 @@
class ScStreamFilter
{
-
public:
ScStreamFilter(QDataStream* stream);
ScStreamFilter(ScStreamFilter* filter);
Modified: trunk/Scribus/scribus/scstreamfilter_ascii85.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=25065&path=/trunk/Scribus/scribus/scstreamfilter_ascii85.h
==============================================================================
--- trunk/Scribus/scribus/scstreamfilter_ascii85.h (original)
+++ trunk/Scribus/scribus/scstreamfilter_ascii85.h Sun Mar 27 14:11:57 2022
@@ -14,13 +14,6 @@
class ScASCII85EncodeFilter : public ScStreamFilter
{
-protected:
- QByteArray m_buffer;
- int m_buffer_pending { 0 };
-
- unsigned char m_four_tuple[4] { 0 };
- int m_four_tuple_pending { 0 };
-
public:
ScASCII85EncodeFilter(QDataStream* stream);
ScASCII85EncodeFilter(ScStreamFilter* filter);
@@ -29,6 +22,13 @@
bool closeFilter() override;
bool writeData(const char* data, int dataLen) override;
+
+protected:
+ QByteArray m_buffer;
+ int m_buffer_pending { 0 };
+
+ unsigned char m_four_tuple[4] { 0 };
+ int m_four_tuple_pending { 0 };
};
#endif
Modified: trunk/Scribus/scribus/scstreamfilter_flate.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=25065&path=/trunk/Scribus/scribus/scstreamfilter_flate.h
==============================================================================
--- trunk/Scribus/scribus/scstreamfilter_flate.h (original)
+++ trunk/Scribus/scribus/scstreamfilter_flate.h Sun Mar 27 14:11:57 2022
@@ -14,6 +14,16 @@
class ScFlateEncodeFilter : public ScStreamFilter
{
+public:
+ ScFlateEncodeFilter(QDataStream* stream);
+ ScFlateEncodeFilter(ScStreamFilter* filter);
+ ~ScFlateEncodeFilter() override;
+
+ bool openFilter() override;
+ bool closeFilter() override;
+
+ bool writeData(const char* data, int dataLen) override;
+
protected:
bool m_openedFilter { false };
ScFlateEncodeFilterData* m_filterData { nullptr };
@@ -21,16 +31,6 @@
void freeData();
bool writeDeflate(bool flush);
-
-public:
- ScFlateEncodeFilter(QDataStream* stream);
- ScFlateEncodeFilter(ScStreamFilter* filter);
- ~ScFlateEncodeFilter() override;
-
- bool openFilter () override;
- bool closeFilter() override;
-
- bool writeData(const char* data, int dataLen) override;
};
#endif
Modified: trunk/Scribus/scribus/scstreamfilter_rc4.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=25065&path=/trunk/Scribus/scribus/scstreamfilter_rc4.h
==============================================================================
--- trunk/Scribus/scribus/scstreamfilter_rc4.h (original)
+++ trunk/Scribus/scribus/scstreamfilter_rc4.h Sun Mar 27 14:11:57 2022
@@ -16,14 +16,6 @@
class ScRC4EncodeFilter : public ScStreamFilter
{
-protected:
-
- bool m_openedFilter { false };
- ScRC4EncodeFilterData* m_filterData { nullptr };
- QByteArray m_key;
-
- void freeData(void);
-
public:
ScRC4EncodeFilter(QDataStream* stream, const char* key, unsigned int keyLen);
ScRC4EncodeFilter(ScStreamFilter* filter, const char* key, unsigned int keyLen);
@@ -33,6 +25,13 @@
bool closeFilter() override;
bool writeData(const char* data, int dataLen) override;
+
+protected:
+ bool m_openedFilter { false };
+ ScRC4EncodeFilterData* m_filterData { nullptr };
+ QByteArray m_key;
+
+ void freeData(void);
};
#endif
More information about the scribus-commit
mailing list