Changeset 2bb6d04 in mainline for uspace/app

Timestamp:

2019-06-25T14:58:16Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

aeba767

Parents:

cd9531d3

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-13 12:14:16)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-25 14:58:16)

Message:

Curb the proliferation of libdraw headers

libdraw provides a lot of ambiguously named headers, which makes it
confusing. This change merges the subdirectories into single headers,
and moves all headers into draw subdirectory, so that it's obvious
at a glance what library the header belongs to.

Compare:

#include <path.h>
#include <source.h>
#include <font/bitmap_backend.h>
#include <font/pcf.h>

vs.

#include <draw/path.h>
#include <draw/source.h>
#include <draw/font.h>

Location:

uspace/app

Files:

• barber/barber.c (modified) (1 diff)
• fontviewer/fontviewer.c (modified) (1 diff)
• viewer/viewer.c (modified) (1 diff)
• vlaunch/vlaunch.c (modified) (1 diff)

uspace/app/barber/barber.c

@@ -45 +45 @@
 #include <window.h>
 #include <canvas.h>
-#include <surface.h>
-#include <codec/tga.gz.h>
+#include <draw/surface.h>
+#include <draw/codec.h>
 #include "images.h"
 

uspace/app/fontviewer/fontviewer.c

@@ -41 +41 @@
 #include <window.h>
 #include <canvas.h>
-#include <surface.h>
-#include <codec/tga.h>
+#include <draw/surface.h>
+#include <draw/codec.h>
 #include <task.h>
-#include <drawctx.h>
-#include <font/embedded.h>
-#include <font/pcf.h>
+#include <draw/drawctx.h>
+#include <draw/font.h>
 #include <stdarg.h>
 #include <io/verify.h>

uspace/app/viewer/viewer.c

@@ -41 +41 @@
 #include <window.h>
 #include <canvas.h>
-#include <surface.h>
-#include <codec/tga.h>
+#include <draw/surface.h>
+#include <draw/codec.h>
 #include <task.h>
 #include <str.h>

uspace/app/vlaunch/vlaunch.c

@@ -46 +46 @@
 #include <canvas.h>
 
-#include <surface.h>
-#include <source.h>
-#include <drawctx.h>
-#include <codec/tga.h>
+#include <draw/surface.h>
+#include <draw/source.h>
+#include <draw/drawctx.h>
+#include <draw/codec.h>
 
 #include "images.h"