summaryrefslogtreecommitdiff
path: root/beos
diff options
context:
space:
mode:
authorFran├žois Revel <mmu_man@netsurf-browser.org>2012-03-22 21:48:24 +0000
committerFran├žois Revel <mmu_man@netsurf-browser.org>2012-03-22 21:48:24 +0000
commita66adbbfefcc61f4f577b80398a9a0d8941b8441 (patch)
treeb6f6fafc52ec3e0c3d3aff2e7123058b49ec5d69 /beos
parent974f53679449da36b10bdccb3241b1f36f0f1936 (diff)
downloadnetsurf-a66adbbfefcc61f4f577b80398a9a0d8941b8441.tar.gz
netsurf-a66adbbfefcc61f4f577b80398a9a0d8941b8441.tar.bz2
Rename BeOS frontend files to strip the useless beos_ prefix. Fix includes and the rest so it builds.
svn path=/trunk/netsurf/; revision=13554
Diffstat (limited to 'beos')
-rw-r--r--beos/Makefile.target16
-rw-r--r--beos/about.cpp (renamed from beos/beos_about.cpp)6
-rw-r--r--beos/about.h (renamed from beos/beos_about.h)0
-rw-r--r--beos/bitmap.cpp (renamed from beos/beos_bitmap.cpp)6
-rw-r--r--beos/bitmap.h (renamed from beos/beos_bitmap.h)0
-rw-r--r--beos/fetch_rsrc.cpp (renamed from beos/beos_fetch_rsrc.cpp)4
-rw-r--r--beos/fetch_rsrc.h (renamed from beos/beos_fetch_rsrc.h)2
-rw-r--r--beos/filetype.cpp (renamed from beos/beos_filetype.cpp)2
-rw-r--r--beos/filetype.h (renamed from beos/beos_filetype.h)0
-rw-r--r--beos/font.cpp (renamed from beos/beos_font.cpp)6
-rw-r--r--beos/font.h (renamed from beos/beos_font.h)0
-rw-r--r--beos/gui.cpp (renamed from beos/beos_gui.cpp)22
-rw-r--r--beos/gui.h (renamed from beos/beos_gui.h)0
-rw-r--r--beos/gui_options.cpp (renamed from beos/beos_options.cpp)6
-rw-r--r--beos/gui_options.h (renamed from beos/beos_options.h)0
-rw-r--r--beos/login.cpp (renamed from beos/beos_login.cpp)6
-rw-r--r--beos/plotters.cpp (renamed from beos/beos_plotters.cpp)10
-rw-r--r--beos/plotters.h (renamed from beos/beos_plotters.h)0
-rw-r--r--beos/res.h (renamed from beos/beos_res.h)0
-rw-r--r--beos/res.rdef (renamed from beos/beos_res.rdef)2
-rw-r--r--beos/save_complete.cpp (renamed from beos/beos_save_complete.cpp)0
-rw-r--r--beos/scaffolding.cpp (renamed from beos/beos_scaffolding.cpp)18
-rw-r--r--beos/scaffolding.h (renamed from beos/beos_scaffolding.h)0
-rw-r--r--beos/schedule.cpp (renamed from beos/beos_schedule.cpp)0
-rw-r--r--beos/schedule.h (renamed from beos/beos_schedule.h)0
-rw-r--r--beos/search.cpp (renamed from beos/beos_search.cpp)0
-rw-r--r--beos/system_colour.cpp2
-rw-r--r--beos/throbber.cpp (renamed from beos/beos_throbber.cpp)6
-rw-r--r--beos/throbber.h (renamed from beos/beos_throbber.h)0
-rw-r--r--beos/thumbnail.cpp (renamed from beos/beos_thumbnail.cpp)6
-rw-r--r--beos/treeview.cpp (renamed from beos/beos_treeview.cpp)0
-rw-r--r--beos/window.cpp (renamed from beos/beos_window.cpp)14
-rw-r--r--beos/window.h (renamed from beos/beos_window.h)2
33 files changed, 68 insertions, 68 deletions
diff --git a/beos/Makefile.target b/beos/Makefile.target
index 9436e3d2c..964907ed3 100644
--- a/beos/Makefile.target
+++ b/beos/Makefile.target
@@ -84,18 +84,18 @@
# ----------------------------------------------------------------------------
# S_BEOS are sources purely for the BeOS build
-S_BEOS := beos_about.cpp beos_bitmap.cpp beos_fetch_rsrc.cpp \
- beos_filetype.cpp beos_font.cpp beos_gui.cpp beos_login.cpp \
- beos_options.cpp beos_plotters.cpp beos_save_complete.cpp \
- beos_scaffolding.cpp beos_search.cpp beos_schedule.cpp \
- beos_thumbnail.cpp beos_treeview.cpp beos_throbber.cpp \
- beos_window.cpp system_colour.cpp
+S_BEOS := about.cpp bitmap.cpp fetch_rsrc.cpp \
+ filetype.cpp font.cpp gui.cpp login.cpp \
+ gui_options.cpp plotters.cpp save_complete.cpp \
+ scaffolding.cpp search.cpp schedule.cpp \
+ thumbnail.cpp treeview.cpp throbber.cpp \
+ window.cpp system_colour.cpp
S_BEOS := $(addprefix beos/,$(S_BEOS))
-RDEF_BEOS := beos_res.rdef
+RDEF_BEOS := res.rdef
RDEF_BEOS := $(addprefix beos/,$(RDEF_BEOS))
-RDEF_IMP_BEOS := beos_res_import.rdef
+RDEF_IMP_BEOS := res_import.rdef
RDEF_IMP_BEOS := $(addprefix $(OBJROOT)/,$(subst /,_,$(RDEF_IMP_BEOS)))
RDEP_BEOS := \
diff --git a/beos/beos_about.cpp b/beos/about.cpp
index 2d8aaff9f..e5d79df4d 100644
--- a/beos/beos_about.cpp
+++ b/beos/about.cpp
@@ -23,9 +23,9 @@
extern "C" {
#include "utils/log.h"
}
-#include "beos/beos_about.h"
-#include "beos/beos_scaffolding.h"
-#include "beos/beos_window.h"
+#include "beos/about.h"
+#include "beos/scaffolding.h"
+#include "beos/window.h"
#include <Alert.h>
#include <ScrollView.h>
diff --git a/beos/beos_about.h b/beos/about.h
index f80d33f01..f80d33f01 100644
--- a/beos/beos_about.h
+++ b/beos/about.h
diff --git a/beos/beos_bitmap.cpp b/beos/bitmap.cpp
index 5df1fce38..fed692315 100644
--- a/beos/beos_bitmap.cpp
+++ b/beos/bitmap.cpp
@@ -37,9 +37,9 @@ extern "C" {
#include "image/bitmap.h"
#include "utils/log.h"
}
-#include "beos/beos_bitmap.h"
-#include "beos/beos_gui.h"
-#include "beos/beos_scaffolding.h"
+#include "beos/bitmap.h"
+#include "beos/gui.h"
+#include "beos/scaffolding.h"
struct bitmap {
BBitmap *primary;
diff --git a/beos/beos_bitmap.h b/beos/bitmap.h
index 6ec662198..6ec662198 100644
--- a/beos/beos_bitmap.h
+++ b/beos/bitmap.h
diff --git a/beos/beos_fetch_rsrc.cpp b/beos/fetch_rsrc.cpp
index 15b2000a4..79dea4e76 100644
--- a/beos/beos_fetch_rsrc.cpp
+++ b/beos/fetch_rsrc.cpp
@@ -43,8 +43,8 @@ extern "C" {
#include "utils/ring.h"
#include "utils/base64.h"
}
-#include "beos/beos_fetch_rsrc.h"
-#include "beos/beos_gui.h"
+#include "beos/fetch_rsrc.h"
+#include "beos/gui.h"
#include <image.h>
#include <Resources.h>
diff --git a/beos/beos_fetch_rsrc.h b/beos/fetch_rsrc.h
index 0607dbd07..ce17670a4 100644
--- a/beos/beos_fetch_rsrc.h
+++ b/beos/fetch_rsrc.h
@@ -30,6 +30,6 @@ void fetch_rsrc_unregister(void);
class BResources;
BResources *get_app_resources();
-#include "beos_res.h"
+#include "beos/res.h"
#endif
diff --git a/beos/beos_filetype.cpp b/beos/filetype.cpp
index d8920902d..7975041ac 100644
--- a/beos/beos_filetype.cpp
+++ b/beos/filetype.cpp
@@ -37,7 +37,7 @@ extern "C" {
#include "utils/utils.h"
}
-#include "beos/beos_filetype.h"
+#include "beos/filetype.h"
static struct {
const char *type;
diff --git a/beos/beos_filetype.h b/beos/filetype.h
index ab0ef410f..ab0ef410f 100644
--- a/beos/beos_filetype.h
+++ b/beos/filetype.h
diff --git a/beos/beos_font.cpp b/beos/font.cpp
index 5c7d1caf8..a7b1a0c96 100644
--- a/beos/beos_font.cpp
+++ b/beos/font.cpp
@@ -38,9 +38,9 @@ extern "C" {
#include "desktop/options.h"
}
-#include "beos/beos_gui.h"
-#include "beos/beos_font.h"
-#include "beos/beos_plotters.h"
+#include "beos/gui.h"
+#include "beos/font.h"
+#include "beos/plotters.h"
static bool nsfont_width(const plot_font_style_t *fstyle,
const char *string, size_t length,
diff --git a/beos/beos_font.h b/beos/font.h
index aefd898da..aefd898da 100644
--- a/beos/beos_font.h
+++ b/beos/font.h
diff --git a/beos/beos_gui.cpp b/beos/gui.cpp
index a9cf3473c..0c3075006 100644
--- a/beos/beos_gui.cpp
+++ b/beos/gui.cpp
@@ -66,17 +66,17 @@ extern "C" {
#include "utils/utils.h"
}
-#include "beos/beos_gui.h"
-
-#include "beos/beos_options.h"
-//#include "beos/beos_completion.h"
-#include "beos/beos_window.h"
-#include "beos/beos_throbber.h"
-#include "beos/beos_filetype.h"
-//#include "beos/beos_download.h"
-#include "beos/beos_schedule.h"
-#include "beos/beos_fetch_rsrc.h"
-#include "beos/beos_scaffolding.h"
+#include "beos/gui.h"
+
+#include "beos/gui_options.h"
+//#include "beos/completion.h"
+#include "beos/window.h"
+#include "beos/throbber.h"
+#include "beos/filetype.h"
+//#include "beos/download.h"
+#include "beos/schedule.h"
+#include "beos/fetch_rsrc.h"
+#include "beos/scaffolding.h"
static void *myrealloc(void *ptr, size_t len, void *pw);
diff --git a/beos/beos_gui.h b/beos/gui.h
index 6bbfa1dd1..6bbfa1dd1 100644
--- a/beos/beos_gui.h
+++ b/beos/gui.h
diff --git a/beos/beos_options.cpp b/beos/gui_options.cpp
index acef3dcc6..62e6640c3 100644
--- a/beos/beos_options.cpp
+++ b/beos/gui_options.cpp
@@ -25,9 +25,9 @@ extern "C" {
#include "utils/log.h"
#include "desktop/options.h"
}
-#include "beos/beos_gui.h"
-#include "beos/beos_scaffolding.h"
-#include "beos/beos_options.h"
+#include "beos/gui.h"
+#include "beos/scaffolding.h"
+#include "beos/gui_options.h"
#include <View.h>
#include <Window.h>
diff --git a/beos/beos_options.h b/beos/gui_options.h
index 38aaf866a..38aaf866a 100644
--- a/beos/beos_options.h
+++ b/beos/gui_options.h
diff --git a/beos/beos_login.cpp b/beos/login.cpp
index c732cd398..32860de20 100644
--- a/beos/beos_login.cpp
+++ b/beos/login.cpp
@@ -37,9 +37,9 @@ extern "C" {
#include "utils/url.h"
#include "utils/utils.h"
}
-#include "beos/beos_gui.h"
-#include "beos/beos_scaffolding.h"
-#include "beos/beos_window.h"
+#include "beos/gui.h"
+#include "beos/scaffolding.h"
+#include "beos/window.h"
class LoginAlert : public BAlert {
public:
diff --git a/beos/beos_plotters.cpp b/beos/plotters.cpp
index adc9588b3..186627783 100644
--- a/beos/beos_plotters.cpp
+++ b/beos/plotters.cpp
@@ -37,12 +37,12 @@ extern "C" {
#include "utils/utils.h"
#include "desktop/options.h"
}
-#include "beos/beos_font.h"
-#include "beos/beos_gui.h"
-#include "beos/beos_plotters.h"
-//#include "beos/beos_scaffolding.h"
+#include "beos/font.h"
+#include "beos/gui.h"
+#include "beos/plotters.h"
+//#include "beos/scaffolding.h"
//#include "beos/options.h"
-#include "beos/beos_bitmap.h"
+#include "beos/bitmap.h"
#warning MAKE ME static
/*static*/ BView *current_view;
diff --git a/beos/beos_plotters.h b/beos/plotters.h
index 15b97a89e..15b97a89e 100644
--- a/beos/beos_plotters.h
+++ b/beos/plotters.h
diff --git a/beos/beos_res.h b/beos/res.h
index 4e6497815..4e6497815 100644
--- a/beos/beos_res.h
+++ b/beos/res.h
diff --git a/beos/beos_res.rdef b/beos/res.rdef
index 8cb8fd09f..b047bd02a 100644
--- a/beos/beos_res.rdef
+++ b/beos/res.rdef
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "beos_res.h"
+#include "res.h"
/* throbber */
resource(400, "throbber0.png") #'data' import "res/throbber/throbber0.png";
diff --git a/beos/beos_save_complete.cpp b/beos/save_complete.cpp
index 19306dc21..19306dc21 100644
--- a/beos/beos_save_complete.cpp
+++ b/beos/save_complete.cpp
diff --git a/beos/beos_scaffolding.cpp b/beos/scaffolding.cpp
index 0ba2004d9..afe36bd8f 100644
--- a/beos/beos_scaffolding.cpp
+++ b/beos/scaffolding.cpp
@@ -58,15 +58,15 @@ extern "C" {
#include "utils/utils.h"
#include "utils/log.h"
}
-#include "beos/beos_gui.h"
-#include "beos/beos_plotters.h"
-#include "beos/beos_scaffolding.h"
-#include "beos/beos_options.h"
-//#include "beos/beos_completion.h"
-#include "beos/beos_throbber.h"
-#include "beos/beos_window.h"
-//#include "beos/beos_schedule.h"
-//#include "beos/beos_download.h"
+#include "beos/gui.h"
+#include "beos/plotters.h"
+#include "beos/scaffolding.h"
+#include "beos/gui_options.h"
+//#include "beos/completion.h"
+#include "beos/throbber.h"
+#include "beos/window.h"
+//#include "beos/schedule.h"
+//#include "beos/download.h"
#define TOOLBAR_HEIGHT 32
#define DRAGGER_WIDTH 8
diff --git a/beos/beos_scaffolding.h b/beos/scaffolding.h
index ae7839175..ae7839175 100644
--- a/beos/beos_scaffolding.h
+++ b/beos/scaffolding.h
diff --git a/beos/beos_schedule.cpp b/beos/schedule.cpp
index 3f822352a..3f822352a 100644
--- a/beos/beos_schedule.cpp
+++ b/beos/schedule.cpp
diff --git a/beos/beos_schedule.h b/beos/schedule.h
index 02205baf4..02205baf4 100644
--- a/beos/beos_schedule.h
+++ b/beos/schedule.h
diff --git a/beos/beos_search.cpp b/beos/search.cpp
index 97e3d6d5b..97e3d6d5b 100644
--- a/beos/beos_search.cpp
+++ b/beos/search.cpp
diff --git a/beos/system_colour.cpp b/beos/system_colour.cpp
index 1d03b35e6..9c25d8f5e 100644
--- a/beos/system_colour.cpp
+++ b/beos/system_colour.cpp
@@ -39,7 +39,7 @@ extern "C" {
}
-#include "beos/beos_gui.h"
+#include "beos/gui.h"
#if !defined(__HAIKU__) && !defined(B_BEOS_VERSION_DANO)
diff --git a/beos/beos_throbber.cpp b/beos/throbber.cpp
index 6b344068b..f7fb35306 100644
--- a/beos/beos_throbber.cpp
+++ b/beos/throbber.cpp
@@ -23,9 +23,9 @@
extern "C" {
#include "utils/log.h"
}
-#include "beos/beos_throbber.h"
-#include "beos/beos_bitmap.h"
-#include "beos/beos_fetch_rsrc.h"
+#include "beos/throbber.h"
+#include "beos/bitmap.h"
+#include "beos/fetch_rsrc.h"
#include <File.h>
#include <Resources.h>
diff --git a/beos/beos_throbber.h b/beos/throbber.h
index 670c60a06..670c60a06 100644
--- a/beos/beos_throbber.h
+++ b/beos/throbber.h
diff --git a/beos/beos_thumbnail.cpp b/beos/thumbnail.cpp
index bd8d74bb0..ea03d29d8 100644
--- a/beos/beos_thumbnail.cpp
+++ b/beos/thumbnail.cpp
@@ -39,9 +39,9 @@ extern "C" {
#include "render/font.h"
#include "utils/log.h"
}
-#include "beos/beos_scaffolding.h"
-#include "beos/beos_plotters.h"
-#include "beos/beos_bitmap.h"
+#include "beos/scaffolding.h"
+#include "beos/plotters.h"
+#include "beos/bitmap.h"
// Zeta PRIVATE: in libzeta for now.
extern status_t ScaleBitmap(const BBitmap& inBitmap, BBitmap& outBitmap);
diff --git a/beos/beos_treeview.cpp b/beos/treeview.cpp
index 4728995ad..4728995ad 100644
--- a/beos/beos_treeview.cpp
+++ b/beos/treeview.cpp
diff --git a/beos/beos_window.cpp b/beos/window.cpp
index 9c608d50d..b0ead3e5c 100644
--- a/beos/beos_window.cpp
+++ b/beos/window.cpp
@@ -34,13 +34,13 @@ extern "C" {
#include "utils/utf8.h"
#include "utils/utils.h"
}
-#include "beos/beos_about.h"
-#include "beos/beos_window.h"
-#include "beos/beos_font.h"
-#include "beos/beos_gui.h"
-#include "beos/beos_scaffolding.h"
-#include "beos/beos_plotters.h"
-//#include "beos/beos_schedule.h"
+#include "beos/about.h"
+#include "beos/window.h"
+#include "beos/font.h"
+#include "beos/gui.h"
+#include "beos/scaffolding.h"
+#include "beos/plotters.h"
+//#include "beos/schedule.h"
#include <AppDefs.h>
#include <BeBuild.h>
diff --git a/beos/beos_window.h b/beos/window.h
index 52b87cc11..fc8a4f832 100644
--- a/beos/beos_window.h
+++ b/beos/window.h
@@ -23,7 +23,7 @@ extern "C" {
#include "desktop/gui.h"
#include "desktop/browser.h"
}
-#include "beos/beos_scaffolding.h"
+#include "beos/scaffolding.h"
class NSBrowserFrameView : public BView {
public: