Skip to content

Commit 623e52a

Browse files
committed
CSS resource files don't need special treatment
As indicated in doxygen#11550 (comment) the css files don't need any special treatment anymore, so making them "Verbatim" and removing obsolete code. Removing in python script reverences to Luminace files as not used either.
1 parent c90748f commit 623e52a

File tree

3 files changed

+1
-44
lines changed

3 files changed

+1
-44
lines changed

src/res2cc_cmd.py

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,6 @@ def convertToBytes(self,outputFile):
5555
@staticmethod
5656
def factory(directory,subdir,fname):
5757
ext = splitext(fname)[1]
58-
if ext=='.lum': # TODO: remove this format
59-
return LumFile(directory,subdir,fname)
60-
if ext=='.luma': # TODO: remove this format
61-
return LumaFile(directory,subdir,fname)
62-
if ext=='.css':
63-
return CSSFile(directory,subdir,fname)
6458
if ext=='.svg':
6559
return SVGFile(directory,subdir,fname)
6660
return VerbatimFile(directory,subdir,fname)
@@ -73,14 +67,6 @@ def writeContents(self,outputFile):
7367
def writeDirEntry(self,outputFile):
7468
print(" { \"%s\", \"%s\", %s_data, %s_len, Resource::Verbatim }," % (self.subdir,self.fileName,self.bareName,self.bareName), file=outputFile)
7569

76-
class CSSFile(File):
77-
def __init__(self,directory,subdir,fileName):
78-
File.__init__(self,directory,subdir,fileName,"r")
79-
def writeContents(self,outputFile):
80-
self.writeBytes(self.inputFile.read(),outputFile)
81-
def writeDirEntry(self,outputFile):
82-
print(" { \"%s\", \"%s\", %s_data, %s_len, Resource::CSS }," % (self.subdir,self.fileName,self.bareName,self.bareName), file=outputFile)
83-
8470
class SVGFile(File):
8571
def __init__(self,directory,subdir,fileName):
8672
File.__init__(self,directory,subdir,fileName,"r")
@@ -89,22 +75,6 @@ def writeContents(self,outputFile):
8975
def writeDirEntry(self,outputFile):
9076
print(" { \"%s\", \"%s\", %s_data, %s_len, Resource::SVG }," % (self.subdir,self.fileName,self.bareName,self.bareName), file=outputFile)
9177

92-
class LumFile(File):
93-
def __init__(self,directory,subdir,fileName):
94-
File.__init__(self,directory,subdir,fileName,"r")
95-
def writeContents(self,outputFile):
96-
self.convertToBytes(outputFile)
97-
def writeDirEntry(self,outputFile):
98-
print(" { \"%s\", \"%s\", %s_data, %s_len, Resource::Luminance }," % (self.subdir,self.fileName,self.bareName,self.bareName), file=outputFile)
99-
100-
class LumaFile(File):
101-
def __init__(self,directory,subdir,fileName):
102-
File.__init__(self,directory,subdir,fileName,"r")
103-
def writeContents(self,outputFile):
104-
self.convertToBytes(outputFile)
105-
def writeDirEntry(self,outputFile):
106-
print(" { \"%s\", \"%s\", %s_data, %s_len, Resource::LumAlpha }," % (self.subdir,self.fileName,self.bareName,self.bareName), file=outputFile)
107-
10878
def main():
10979
if len(sys.argv)<3:
11080
sys.exit('Usage: %s directory output_file.cpp' % sys.argv[0])

src/resourcemgr.cpp

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -99,19 +99,6 @@ bool ResourceMgr::copyResourceAs(const QCString &name,const QCString &targetDir,
9999
}
100100
}
101101
break;
102-
case Resource::CSS:
103-
{
104-
std::ofstream t = Portable::openOutputStream(pathName,append);
105-
if (t.is_open())
106-
{
107-
QCString buf(res->size, QCString::ExplicitSize);
108-
memcpy(buf.rawData(),res->data,res->size);
109-
buf = replaceColorMarkers(buf);
110-
t << substitute(buf,"$doxygenversion",getDoxygenVersion());
111-
return TRUE;
112-
}
113-
}
114-
break;
115102
case Resource::SVG:
116103
{
117104
std::ofstream t = Portable::openOutputStream(pathName,append);

src/resourcemgr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/** @brief Compiled resource */
2525
struct Resource
2626
{
27-
enum Type { Verbatim, CSS, SVG };
27+
enum Type { Verbatim, SVG };
2828
const char *category;
2929
const char *name;
3030
const unsigned char *data;

0 commit comments

Comments
 (0)