Fix frenchism.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23758 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2008-01-26 23:27:00 +00:00
parent 46b5cc220a
commit 72afb0dcaa
16 changed files with 58 additions and 58 deletions
+17 -17
View File
@@ -95,7 +95,7 @@ status_t ThemeManager::LoadAddons()
int32 i;
status_t err;
image_id img;
ThemesAddon *(*instanciate_func)();
ThemesAddon *(*instantiate_func)();
#endif
#ifndef SINGLE_BINARY
@@ -125,14 +125,14 @@ status_t ThemeManager::LoadAddons()
fprintf(stderr, "ThemeManager: load_add_on 0x%08lx\n", img);
if (img < B_OK)
continue;
err = get_image_symbol(img, "instanciate_themes_addon",
B_SYMBOL_TYPE_TEXT, (void **)&instanciate_func);
err = get_image_symbol(img, "instantiate_themes_addon",
B_SYMBOL_TYPE_TEXT, (void **)&instantiate_func);
if (err)
fprintf(stderr, "ThemeManager: get_image_symbol 0x%08lx\n", err);
if (err) continue;
ta = instanciate_func();
ta = instantiate_func();
if (!ta)
fprintf(stderr, "ThemeManager: instanciate_themes_addon returned NULL\n");
fprintf(stderr, "ThemeManager: instantiate_themes_addon returned NULL\n");
if (!ta)
continue;
ta->SetImageId(img);
@@ -171,36 +171,36 @@ status_t ThemeManager::LoadAddons()
}
ta = instanciate_themes_addon_backgrounds();
ta = instantiate_themes_addon_backgrounds();
ADDA(ta);
ta = instanciate_themes_addon_beide();
ta = instantiate_themes_addon_beide();
ADDA(ta);
ta = instanciate_themes_addon_deskbar();
ta = instantiate_themes_addon_deskbar();
ADDA(ta);
#ifndef ZETA_ADDONS
ta = instanciate_themes_addon_eddie();
ta = instantiate_themes_addon_eddie();
ADDA(ta);
#endif
ta = instanciate_themes_addon_pe();
ta = instantiate_themes_addon_pe();
ADDA(ta);
ta = instanciate_themes_addon_screensaver();
ta = instantiate_themes_addon_screensaver();
ADDA(ta);
#ifndef ZETA_ADDONS
ta = instanciate_themes_addon_soundplay();
ta = instantiate_themes_addon_soundplay();
ADDA(ta);
#endif
ta = instanciate_themes_addon_sounds();
ta = instanciate_themes_addon_terminal();
ta = instantiate_themes_addon_sounds();
ta = instantiate_themes_addon_terminal();
ADDA(ta);
#if defined(__HAIKU__) || defined(B_BEOS_VERSION_DANO)
ta = instanciate_themes_addon_ui_settings();
ta = instantiate_themes_addon_ui_settings();
ADDA(ta);
#endif
#ifndef ZETA_ADDONS
ta = instanciate_themes_addon_winamp_skin();
ta = instantiate_themes_addon_winamp_skin();
ADDA(ta);
#endif
ta = instanciate_themes_addon_window_decor();
ta = instantiate_themes_addon_window_decor();
ADDA(ta);
#endif
//if (err) return err;
+13 -13
View File
@@ -73,21 +73,21 @@ friend class Z::ThemeManager::ThemeManager;
} // ns ThemeManager
} // ns Z
extern "C" Z::ThemeManager::ThemesAddon *instanciate_themes_addon();
extern "C" Z::ThemeManager::ThemesAddon *instantiate_themes_addon();
#ifdef SINGLE_BINARY
extern "C" Z::ThemeManager::ThemesAddon *instanciate_themes_addon_backgrounds();
extern "C" Z::ThemeManager::ThemesAddon *instanciate_themes_addon_beide();
extern "C" Z::ThemeManager::ThemesAddon *instanciate_themes_addon_deskbar();
extern "C" Z::ThemeManager::ThemesAddon *instanciate_themes_addon_eddie();
extern "C" Z::ThemeManager::ThemesAddon *instanciate_themes_addon_pe();
extern "C" Z::ThemeManager::ThemesAddon *instanciate_themes_addon_screensaver();
extern "C" Z::ThemeManager::ThemesAddon *instanciate_themes_addon_soundplay();
extern "C" Z::ThemeManager::ThemesAddon *instanciate_themes_addon_sounds();
extern "C" Z::ThemeManager::ThemesAddon *instanciate_themes_addon_terminal();
extern "C" Z::ThemeManager::ThemesAddon *instanciate_themes_addon_ui_settings();
extern "C" Z::ThemeManager::ThemesAddon *instanciate_themes_addon_winamp_skin();
extern "C" Z::ThemeManager::ThemesAddon *instanciate_themes_addon_window_decor();
extern "C" Z::ThemeManager::ThemesAddon *instantiate_themes_addon_backgrounds();
extern "C" Z::ThemeManager::ThemesAddon *instantiate_themes_addon_beide();
extern "C" Z::ThemeManager::ThemesAddon *instantiate_themes_addon_deskbar();
extern "C" Z::ThemeManager::ThemesAddon *instantiate_themes_addon_eddie();
extern "C" Z::ThemeManager::ThemesAddon *instantiate_themes_addon_pe();
extern "C" Z::ThemeManager::ThemesAddon *instantiate_themes_addon_screensaver();
extern "C" Z::ThemeManager::ThemesAddon *instantiate_themes_addon_soundplay();
extern "C" Z::ThemeManager::ThemesAddon *instantiate_themes_addon_sounds();
extern "C" Z::ThemeManager::ThemesAddon *instantiate_themes_addon_terminal();
extern "C" Z::ThemeManager::ThemesAddon *instantiate_themes_addon_ui_settings();
extern "C" Z::ThemeManager::ThemesAddon *instantiate_themes_addon_winamp_skin();
extern "C" Z::ThemeManager::ThemesAddon *instantiate_themes_addon_window_decor();
#endif
/* in B_*_ADDONS_DIRECTORY */
+2 -2
View File
@@ -24,7 +24,7 @@
#include "Utils.h"
#ifdef SINGLE_BINARY
#define instanciate_themes_addon instanciate_themes_addon_backgrounds
#define instantiate_themes_addon instantiate_themes_addon_backgrounds
#endif
#define A_NAME "Backgrounds"
@@ -263,7 +263,7 @@ status_t BackgroundThemesAddon::BackupFiles(BMessage &theme, BDirectory &folder)
}
ThemesAddon *instanciate_themes_addon()
ThemesAddon *instantiate_themes_addon()
{
return (ThemesAddon *) new BackgroundThemesAddon;
}
+2 -2
View File
@@ -23,7 +23,7 @@
#include "Utils.h"
#ifdef SINGLE_BINARY
#define instanciate_themes_addon instanciate_themes_addon_beide
#define instantiate_themes_addon instantiate_themes_addon_beide
#endif
#define A_NAME "BeIDE Colors"
@@ -185,7 +185,7 @@ status_t BeIDEThemesAddon::ApplyDefaultTheme(uint32 flags)
}
ThemesAddon *instanciate_themes_addon()
ThemesAddon *instantiate_themes_addon()
{
return (ThemesAddon *) new BeIDEThemesAddon;
}
+2 -2
View File
@@ -24,7 +24,7 @@
#include "UITheme.h"
#ifdef SINGLE_BINARY
#define instanciate_themes_addon instanciate_themes_addon_window_decor
#define instantiate_themes_addon instantiate_themes_addon_window_decor
#endif
#define A_NAME "Window Decor"
@@ -156,7 +156,7 @@ status_t DecorThemesAddon::ApplyDefaultTheme(uint32 flags)
}
ThemesAddon *instanciate_themes_addon()
ThemesAddon *instantiate_themes_addon()
{
return (ThemesAddon *) new DecorThemesAddon;
}
+2 -2
View File
@@ -20,7 +20,7 @@
#include "UITheme.h"
#ifdef SINGLE_BINARY
#define instanciate_themes_addon instanciate_themes_addon_ui_settings
#define instantiate_themes_addon instantiate_themes_addon_ui_settings
#endif
//#define A_NAME "UI Settings"
@@ -205,7 +205,7 @@ status_t UISettingsThemesAddon::ApplyDefaultTheme(uint32 flags)
}
ThemesAddon *instanciate_themes_addon()
ThemesAddon *instantiate_themes_addon()
{
return (ThemesAddon *) new UISettingsThemesAddon;
}
+2 -2
View File
@@ -16,7 +16,7 @@
#include "UITheme.h"
#ifdef SINGLE_BINARY
#define instanciate_themes_addon instanciate_themes_addon_deskbar
#define instantiate_themes_addon instantiate_themes_addon_deskbar
#endif
#define A_NAME "Deskbar"
@@ -150,7 +150,7 @@ status_t DeskbarThemesAddon::ApplyDefaultTheme(uint32 flags)
}
ThemesAddon *instanciate_themes_addon()
ThemesAddon *instantiate_themes_addon()
{
return (ThemesAddon *) new DeskbarThemesAddon;
}
+2 -2
View File
@@ -23,7 +23,7 @@
#include "Utils.h"
#ifdef SINGLE_BINARY
#define instanciate_themes_addon instanciate_themes_addon_eddie
#define instantiate_themes_addon instantiate_themes_addon_eddie
#endif
#define A_NAME "Eddie Colors"
@@ -142,7 +142,7 @@ status_t EddieThemesAddon::ApplyDefaultTheme(uint32 flags)
}
ThemesAddon *instanciate_themes_addon()
ThemesAddon *instantiate_themes_addon()
{
return (ThemesAddon *) new EddieThemesAddon;
}
+2 -2
View File
@@ -23,7 +23,7 @@
#include "Utils.h"
#ifdef SINGLE_BINARY
#define instanciate_themes_addon instanciate_themes_addon_ui_settings
#define instantiate_themes_addon instantiate_themes_addon_ui_settings
#endif
#define DEBUG_TA
@@ -360,7 +360,7 @@ status_t UISettingsThemesAddon::ApplyDefaultTheme(uint32 flags)
}
ThemesAddon *instanciate_themes_addon()
ThemesAddon *instantiate_themes_addon()
{
return (ThemesAddon *) new UISettingsThemesAddon;
}
+2 -2
View File
@@ -25,7 +25,7 @@
#include "UITheme.h"
#ifdef SINGLE_BINARY
#define instanciate_themes_addon instanciate_themes_addon_window_decor
#define instantiate_themes_addon instantiate_themes_addon_window_decor
#endif
#define DERR(e) { PRINT(("%s: err: %s\n", __FUNCTION__, strerror(e))); }
@@ -199,7 +199,7 @@ status_t DecorThemesAddon::ApplyDefaultTheme(uint32 flags)
}
ThemesAddon *instanciate_themes_addon()
ThemesAddon *instantiate_themes_addon()
{
return (ThemesAddon *) new DecorThemesAddon;
}
+2 -2
View File
@@ -23,7 +23,7 @@
#include "Utils.h"
#ifdef SINGLE_BINARY
#define instanciate_themes_addon instanciate_themes_addon_pe
#define instantiate_themes_addon instantiate_themes_addon_pe
#endif
#define A_NAME "Pe Colors"
@@ -142,7 +142,7 @@ status_t PeThemesAddon::ApplyDefaultTheme(uint32 flags)
}
ThemesAddon *instanciate_themes_addon()
ThemesAddon *instantiate_themes_addon()
{
return (ThemesAddon *) new PeThemesAddon;
}
+2 -2
View File
@@ -20,7 +20,7 @@
#include "UITheme.h"
#ifdef SINGLE_BINARY
#define instanciate_themes_addon instanciate_themes_addon_screensaver
#define instantiate_themes_addon instantiate_themes_addon_screensaver
#endif
#define A_NAME "Screensaver"
@@ -178,7 +178,7 @@ status_t ScreensaverThemesAddon::ApplyDefaultTheme(uint32 flags)
}
ThemesAddon *instanciate_themes_addon()
ThemesAddon *instantiate_themes_addon()
{
return (ThemesAddon *) new ScreensaverThemesAddon;
}
+2 -2
View File
@@ -18,7 +18,7 @@
#include "Utils.h"
#ifdef SINGLE_BINARY
#define instanciate_themes_addon instanciate_themes_addon_soundplay
#define instantiate_themes_addon instantiate_themes_addon_soundplay
#endif
#define A_NAME "SoundPlay Color"
@@ -128,7 +128,7 @@ status_t SoundplayThemesAddon::ApplyDefaultTheme(uint32 flags)
}
ThemesAddon *instanciate_themes_addon()
ThemesAddon *instantiate_themes_addon()
{
return (ThemesAddon *) new SoundplayThemesAddon;
}
+2 -2
View File
@@ -20,7 +20,7 @@
#include "Utils.h"
#ifdef SINGLE_BINARY
#define instanciate_themes_addon instanciate_themes_addon_sounds
#define instantiate_themes_addon instantiate_themes_addon_sounds
#endif
#define A_NAME "Sounds"
@@ -201,7 +201,7 @@ status_t SoundsThemesAddon::ApplyDefaultTheme(uint32 flags)
}
ThemesAddon *instanciate_themes_addon()
ThemesAddon *instantiate_themes_addon()
{
return (ThemesAddon *) new SoundsThemesAddon;
}
+2 -2
View File
@@ -26,7 +26,7 @@
#include "Utils.h"
#ifdef SINGLE_BINARY
#define instanciate_themes_addon instanciate_themes_addon_terminal
#define instantiate_themes_addon instantiate_themes_addon_terminal
#endif
#define A_NAME "Terminal"
@@ -682,7 +682,7 @@ status_t TerminalThemesAddon::SaveHaikuTerminalSettings(BMessage &from)
}
ThemesAddon *instanciate_themes_addon()
ThemesAddon *instantiate_themes_addon()
{
return (ThemesAddon *) new TerminalThemesAddon;
}
+2 -2
View File
@@ -24,7 +24,7 @@
#include "UITheme.h"
#ifdef SINGLE_BINARY
#define instanciate_themes_addon instanciate_themes_addon_winamp_skin
#define instantiate_themes_addon instantiate_themes_addon_winamp_skin
#endif
#define A_NAME "Winamp Skin"
@@ -421,7 +421,7 @@ status_t WinampSkinThemesAddon::StripPath(BString *path)
ThemesAddon *instanciate_themes_addon()
ThemesAddon *instantiate_themes_addon()
{
return (ThemesAddon *) new WinampSkinThemesAddon;
}