diff --git a/src/add-ons/translators/bmptranslator/BMPTranslator.h b/src/add-ons/translators/bmptranslator/BMPTranslator.h index 208ea8b0ec..4e4d4bcd53 100644 --- a/src/add-ons/translators/bmptranslator/BMPTranslator.h +++ b/src/add-ons/translators/bmptranslator/BMPTranslator.h @@ -42,7 +42,7 @@ #define BMP_RLE8_COMPRESS 1 #define BMP_RLE4_COMPRESS 2 -#define BMP_TRANSLATOR_VERSION B_TRANSLATION_MAKE_VER(1,0,0) +#define BMP_TRANSLATOR_VERSION B_TRANSLATION_MAKE_VERSION(1,0,0) #define BMP_IN_QUALITY 0.4 #define BMP_IN_CAPABILITY 0.8 #define BMP_OUT_QUALITY 0.4 diff --git a/src/add-ons/translators/bmptranslator/BMPView.cpp b/src/add-ons/translators/bmptranslator/BMPView.cpp index 5791b16a6d..a37b2a4a28 100644 --- a/src/add-ons/translators/bmptranslator/BMPView.cpp +++ b/src/add-ons/translators/bmptranslator/BMPView.cpp @@ -105,9 +105,9 @@ BMPView::Draw(BRect area) char detail[100]; sprintf(detail, "Version %d.%d.%d %s", - static_cast(B_TRANSLATION_MAJOR_VER(BMP_TRANSLATOR_VERSION)), - static_cast(B_TRANSLATION_MINOR_VER(BMP_TRANSLATOR_VERSION)), - static_cast(B_TRANSLATION_REVSN_VER(BMP_TRANSLATOR_VERSION)), + static_cast(B_TRANSLATION_MAJOR_VERSION(BMP_TRANSLATOR_VERSION)), + static_cast(B_TRANSLATION_MINOR_VERSION(BMP_TRANSLATOR_VERSION)), + static_cast(B_TRANSLATION_REVISION_VERSION(BMP_TRANSLATOR_VERSION)), __DATE__); DrawString(detail, BPoint(xbold, yplain + ybold)); diff --git a/src/add-ons/translators/libtifftranslator/TIFFTranslator.h b/src/add-ons/translators/libtifftranslator/TIFFTranslator.h index 991abc095f..ab6cc40d4f 100644 --- a/src/add-ons/translators/libtifftranslator/TIFFTranslator.h +++ b/src/add-ons/translators/libtifftranslator/TIFFTranslator.h @@ -50,7 +50,7 @@ // TIFF Translator Settings #define TIFF_SETTING_COMPRESSION "tiff /compression" -#define TIFF_TRANSLATOR_VERSION B_TRANSLATION_MAKE_VER(1,0,0) +#define TIFF_TRANSLATOR_VERSION B_TRANSLATION_MAKE_VERSION(1,0,0) #define TIFF_IN_QUALITY 0.7 #define TIFF_IN_CAPABILITY 0.6 diff --git a/src/add-ons/translators/libtifftranslator/TIFFView.cpp b/src/add-ons/translators/libtifftranslator/TIFFView.cpp index 1474de215c..7328f2d433 100644 --- a/src/add-ons/translators/libtifftranslator/TIFFView.cpp +++ b/src/add-ons/translators/libtifftranslator/TIFFView.cpp @@ -204,9 +204,9 @@ TIFFView::Draw(BRect area) char detail[100]; sprintf(detail, "Version %d.%d.%d %s", - static_cast(B_TRANSLATION_MAJOR_VER(TIFF_TRANSLATOR_VERSION)), - static_cast(B_TRANSLATION_MINOR_VER(TIFF_TRANSLATOR_VERSION)), - static_cast(B_TRANSLATION_REVSN_VER(TIFF_TRANSLATOR_VERSION)), + static_cast(B_TRANSLATION_MAJOR_VERSION(TIFF_TRANSLATOR_VERSION)), + static_cast(B_TRANSLATION_MINOR_VERSION(TIFF_TRANSLATOR_VERSION)), + static_cast(B_TRANSLATION_REVISION_VERSION(TIFF_TRANSLATOR_VERSION)), __DATE__); DrawString(detail, BPoint(xbold, yplain + ybold)); diff --git a/src/add-ons/translators/pngtranslator/PNGTranslator.h b/src/add-ons/translators/pngtranslator/PNGTranslator.h index ca8bf93b35..fae340ef27 100644 --- a/src/add-ons/translators/pngtranslator/PNGTranslator.h +++ b/src/add-ons/translators/pngtranslator/PNGTranslator.h @@ -46,7 +46,7 @@ // PNG Translator Settings #define PNG_SETTING_INTERLACE "png /interlace" -#define PNG_TRANSLATOR_VERSION B_TRANSLATION_MAKE_VER(1,0,0) +#define PNG_TRANSLATOR_VERSION B_TRANSLATION_MAKE_VERSION(1,0,0) #define PNG_IN_QUALITY 0.8 #define PNG_IN_CAPABILITY 0.8 diff --git a/src/add-ons/translators/pngtranslator/PNGView.cpp b/src/add-ons/translators/pngtranslator/PNGView.cpp index 1cd13e61d9..d299ea5150 100644 --- a/src/add-ons/translators/pngtranslator/PNGView.cpp +++ b/src/add-ons/translators/pngtranslator/PNGView.cpp @@ -152,9 +152,9 @@ PNGView::Draw(BRect area) char detail[100]; sprintf(detail, "Version %d.%d.%d %s", - static_cast(B_TRANSLATION_MAJOR_VER(PNG_TRANSLATOR_VERSION)), - static_cast(B_TRANSLATION_MINOR_VER(PNG_TRANSLATOR_VERSION)), - static_cast(B_TRANSLATION_REVSN_VER(PNG_TRANSLATOR_VERSION)), + static_cast(B_TRANSLATION_MAJOR_VERSION(PNG_TRANSLATOR_VERSION)), + static_cast(B_TRANSLATION_MINOR_VERSION(PNG_TRANSLATOR_VERSION)), + static_cast(B_TRANSLATION_REVISION_VERSION(PNG_TRANSLATOR_VERSION)), __DATE__); DrawString(detail, BPoint(xbold, yplain + ybold)); diff --git a/src/add-ons/translators/rtftranslator/ConfigView.cpp b/src/add-ons/translators/rtftranslator/ConfigView.cpp index 61d54bf89c..fbc1103f06 100644 --- a/src/add-ons/translators/rtftranslator/ConfigView.cpp +++ b/src/add-ons/translators/rtftranslator/ConfigView.cpp @@ -31,9 +31,9 @@ ConfigView::ConfigView(const BRect &frame, uint32 resize, uint32 flags) rect.OffsetBy(0, height + 10); char version[256]; sprintf(version, "Version %d.%d.%d, %s", - int(B_TRANSLATION_MAJOR_VER(RTF_TRANSLATOR_VERSION)), - int(B_TRANSLATION_MINOR_VER(RTF_TRANSLATOR_VERSION)), - int(B_TRANSLATION_REVSN_VER(RTF_TRANSLATOR_VERSION)), + int(B_TRANSLATION_MAJOR_VERSION(RTF_TRANSLATOR_VERSION)), + int(B_TRANSLATION_MINOR_VERSION(RTF_TRANSLATOR_VERSION)), + int(B_TRANSLATION_REVISION_VERSION(RTF_TRANSLATOR_VERSION)), __DATE__); stringView = new BStringView(rect, "version", version); stringView->ResizeToPreferred(); diff --git a/src/add-ons/translators/rtftranslator/RTFTranslator.cpp b/src/add-ons/translators/rtftranslator/RTFTranslator.cpp index 42bf598387..8b25e621ed 100644 --- a/src/add-ons/translators/rtftranslator/RTFTranslator.cpp +++ b/src/add-ons/translators/rtftranslator/RTFTranslator.cpp @@ -55,9 +55,9 @@ RTFTranslator::RTFTranslator() { char info[256]; sprintf(info, "Rich Text Format Translator v%d.%d.%d %s", - int(B_TRANSLATION_MAJOR_VER(RTF_TRANSLATOR_VERSION)), - int(B_TRANSLATION_MINOR_VER(RTF_TRANSLATOR_VERSION)), - int(B_TRANSLATION_REVSN_VER(RTF_TRANSLATOR_VERSION)), + int(B_TRANSLATION_MAJOR_VERSION(RTF_TRANSLATOR_VERSION)), + int(B_TRANSLATION_MINOR_VERSION(RTF_TRANSLATOR_VERSION)), + int(B_TRANSLATION_REVISION_VERSION(RTF_TRANSLATOR_VERSION)), __DATE__); fInfo = strdup(info); diff --git a/src/add-ons/translators/rtftranslator/RTFTranslator.h b/src/add-ons/translators/rtftranslator/RTFTranslator.h index 7b2218f248..7ad123326c 100644 --- a/src/add-ons/translators/rtftranslator/RTFTranslator.h +++ b/src/add-ons/translators/rtftranslator/RTFTranslator.h @@ -17,7 +17,7 @@ #include -#define RTF_TRANSLATOR_VERSION B_TRANSLATION_MAKE_VER(0, 6, 0) +#define RTF_TRANSLATOR_VERSION B_TRANSLATION_MAKE_VERSION(0, 6, 0) #define RTF_TEXT_FORMAT 'RTF ' #define RTF_IN_QUALITY 0.7 #define RTF_IN_CAPABILITY 0.9 diff --git a/src/add-ons/translators/sgitranslator/SGITranslator.h b/src/add-ons/translators/sgitranslator/SGITranslator.h index eefeb10c4c..0c51d75b4b 100644 --- a/src/add-ons/translators/sgitranslator/SGITranslator.h +++ b/src/add-ons/translators/sgitranslator/SGITranslator.h @@ -45,7 +45,7 @@ #include #include "BaseTranslator.h" -#define SGI_TRANSLATOR_VERSION B_TRANSLATION_MAKE_VER(1,0,0) +#define SGI_TRANSLATOR_VERSION B_TRANSLATION_MAKE_VERSION(1,0,0) #define SGI_IN_QUALITY 0.5 #define SGI_IN_CAPABILITY 0.6 diff --git a/src/add-ons/translators/sgitranslator/SGIView.cpp b/src/add-ons/translators/sgitranslator/SGIView.cpp index b69ec2b4cd..1f495d1073 100644 --- a/src/add-ons/translators/sgitranslator/SGIView.cpp +++ b/src/add-ons/translators/sgitranslator/SGIView.cpp @@ -278,9 +278,9 @@ SGIView::Draw(BRect area) char detail[100]; sprintf(detail, "Version %d.%d.%d %s", - static_cast(B_TRANSLATION_MAJOR_VER(SGI_TRANSLATOR_VERSION)), - static_cast(B_TRANSLATION_MINOR_VER(SGI_TRANSLATOR_VERSION)), - static_cast(B_TRANSLATION_REVSN_VER(SGI_TRANSLATOR_VERSION)), + static_cast(B_TRANSLATION_MAJOR_VERSION(SGI_TRANSLATOR_VERSION)), + static_cast(B_TRANSLATION_MINOR_VERSION(SGI_TRANSLATOR_VERSION)), + static_cast(B_TRANSLATION_REVISION_VERSION(SGI_TRANSLATOR_VERSION)), __DATE__); DrawString(detail, BPoint(xbold, yplain + ybold)); diff --git a/src/add-ons/translators/shared/BaseTranslator.cpp b/src/add-ons/translators/shared/BaseTranslator.cpp index 74cb10c7b2..e2a9b300de 100644 --- a/src/add-ons/translators/shared/BaseTranslator.cpp +++ b/src/add-ons/translators/shared/BaseTranslator.cpp @@ -64,9 +64,9 @@ BaseTranslator::BaseTranslator(const char *name, const char *info, strcpy(fName, name); fInfo = new char[strlen(info) + 41]; sprintf(fInfo, "%s v%d.%d.%d %s", info, - static_cast(B_TRANSLATION_MAJOR_VER(fVersion)), - static_cast(B_TRANSLATION_MINOR_VER(fVersion)), - static_cast(B_TRANSLATION_REVSN_VER(fVersion)), + static_cast(B_TRANSLATION_MAJOR_VERSION(fVersion)), + static_cast(B_TRANSLATION_MINOR_VERSION(fVersion)), + static_cast(B_TRANSLATION_REVISION_VERSION(fVersion)), __DATE__); fInputFormats = inFormats; diff --git a/src/add-ons/translators/stxttranslator/STXTTranslator.h b/src/add-ons/translators/stxttranslator/STXTTranslator.h index fc11f8f25a..84c828b236 100644 --- a/src/add-ons/translators/stxttranslator/STXTTranslator.h +++ b/src/add-ons/translators/stxttranslator/STXTTranslator.h @@ -43,7 +43,7 @@ #include #include "BaseTranslator.h" -#define STXT_TRANSLATOR_VERSION B_TRANSLATION_MAKE_VER(1,0,0) +#define STXT_TRANSLATOR_VERSION B_TRANSLATION_MAKE_VERSION(1,0,0) #define STXT_IN_QUALITY 0.5 #define STXT_IN_CAPABILITY 0.5 #define STXT_OUT_QUALITY 0.5 diff --git a/src/add-ons/translators/stxttranslator/STXTView.cpp b/src/add-ons/translators/stxttranslator/STXTView.cpp index ca4c2941f2..143faa26f0 100644 --- a/src/add-ons/translators/stxttranslator/STXTView.cpp +++ b/src/add-ons/translators/stxttranslator/STXTView.cpp @@ -107,9 +107,9 @@ STXTView::Draw(BRect area) char detail[100]; sprintf(detail, "Version %d.%d.%d %s", - static_cast(B_TRANSLATION_MAJOR_VER(STXT_TRANSLATOR_VERSION)), - static_cast(B_TRANSLATION_MINOR_VER(STXT_TRANSLATOR_VERSION)), - static_cast(B_TRANSLATION_REVSN_VER(STXT_TRANSLATOR_VERSION)), + static_cast(B_TRANSLATION_MAJOR_VERSION(STXT_TRANSLATOR_VERSION)), + static_cast(B_TRANSLATION_MINOR_VERSION(STXT_TRANSLATOR_VERSION)), + static_cast(B_TRANSLATION_REVISION_VERSION(STXT_TRANSLATOR_VERSION)), __DATE__); DrawString(detail, BPoint(xbold, yplain + ybold)); /* char copyright[] = "© 2002 OpenBeOS Project"; diff --git a/src/add-ons/translators/tgatranslator/TGATranslator.h b/src/add-ons/translators/tgatranslator/TGATranslator.h index 42225be111..9d325e9e49 100644 --- a/src/add-ons/translators/tgatranslator/TGATranslator.h +++ b/src/add-ons/translators/tgatranslator/TGATranslator.h @@ -40,7 +40,7 @@ #include #include "BaseTranslator.h" -#define TGA_TRANSLATOR_VERSION B_TRANSLATION_MAKE_VER(1,0,0) +#define TGA_TRANSLATOR_VERSION B_TRANSLATION_MAKE_VERSION(1,0,0) #define TGA_IN_QUALITY 0.7 #define TGA_IN_CAPABILITY 0.8 #define TGA_OUT_QUALITY 0.7 diff --git a/src/add-ons/translators/tgatranslator/TGAView.cpp b/src/add-ons/translators/tgatranslator/TGAView.cpp index 0683606980..b10f1aa5e6 100644 --- a/src/add-ons/translators/tgatranslator/TGAView.cpp +++ b/src/add-ons/translators/tgatranslator/TGAView.cpp @@ -191,9 +191,9 @@ TGAView::Draw(BRect area) char detail[100]; sprintf(detail, "Version %d.%d.%d %s", - static_cast(B_TRANSLATION_MAJOR_VER(TGA_TRANSLATOR_VERSION)), - static_cast(B_TRANSLATION_MINOR_VER(TGA_TRANSLATOR_VERSION)), - static_cast(B_TRANSLATION_REVSN_VER(TGA_TRANSLATOR_VERSION)), + static_cast(B_TRANSLATION_MAJOR_VERSION(TGA_TRANSLATOR_VERSION)), + static_cast(B_TRANSLATION_MINOR_VERSION(TGA_TRANSLATOR_VERSION)), + static_cast(B_TRANSLATION_REVISION_VERSION(TGA_TRANSLATOR_VERSION)), __DATE__); DrawString(detail, BPoint(xbold, yplain + ybold)); /* char copyright[] = "© 2002 OpenBeOS Project"; diff --git a/src/kits/translation/TranslatorRoster.cpp b/src/kits/translation/TranslatorRoster.cpp index 435d04b0d7..8f8c3136e4 100644 --- a/src/kits/translation/TranslatorRoster.cpp +++ b/src/kits/translation/TranslatorRoster.cpp @@ -329,9 +329,9 @@ BTranslatorRoster::Version(int32 *outCurVersion, int32 *outMinVersion, static char vDate[] = __DATE__; if (!vString[0]) { sprintf(vString, "Translation Kit v%d.%d.%d %s\n", - static_cast(B_TRANSLATION_MAJOR_VER(B_TRANSLATION_CURRENT_VERSION)), - static_cast(B_TRANSLATION_MINOR_VER(B_TRANSLATION_CURRENT_VERSION)), - static_cast(B_TRANSLATION_REVSN_VER(B_TRANSLATION_CURRENT_VERSION)), + static_cast(B_TRANSLATION_MAJOR_VERSION(B_TRANSLATION_CURRENT_VERSION)), + static_cast(B_TRANSLATION_MINOR_VERSION(B_TRANSLATION_CURRENT_VERSION)), + static_cast(B_TRANSLATION_REVISION_VERSION(B_TRANSLATION_CURRENT_VERSION)), vDate); } *outCurVersion = B_TRANSLATION_CURRENT_VERSION; diff --git a/src/prefs/datatranslations/DataTranslationsWindow.cpp b/src/prefs/datatranslations/DataTranslationsWindow.cpp index e247db2a29..ee212ad242 100644 --- a/src/prefs/datatranslations/DataTranslationsWindow.cpp +++ b/src/prefs/datatranslations/DataTranslationsWindow.cpp @@ -264,9 +264,9 @@ DataTranslationsWindow::MessageReceived(BMessage *message) else { // Convert the version number into a readable format strInfoMsg << - static_cast(B_TRANSLATION_MAJOR_VER(tranVersion)) << '.' << - static_cast(B_TRANSLATION_MINOR_VER(tranVersion)) << '.' << - static_cast(B_TRANSLATION_REVSN_VER(tranVersion)); + static_cast(B_TRANSLATION_MAJOR_VERSION(tranVersion)) << '.' << + static_cast(B_TRANSLATION_MINOR_VERSION(tranVersion)) << '.' << + static_cast(B_TRANSLATION_REVISION_VERSION(tranVersion)); } strInfoMsg << "\nInfo: " << tranInfo << "\nPath: " << tranPath.Path() << "\n"; diff --git a/src/tests/add-ons/translators/bmptranslator/BMPTranslatorTest.cpp b/src/tests/add-ons/translators/bmptranslator/BMPTranslatorTest.cpp index 47acab6e9a..e3c3a060b4 100644 --- a/src/tests/add-ons/translators/bmptranslator/BMPTranslatorTest.cpp +++ b/src/tests/add-ons/translators/bmptranslator/BMPTranslatorTest.cpp @@ -1159,7 +1159,7 @@ BMPTranslatorTest::LoadAddOnTest() this, gBMPInputFormats, sizeof(gBMPInputFormats) / sizeof(translation_format), gBMPOutputFormats, sizeof(gBMPOutputFormats) / sizeof(translation_format), - B_TRANSLATION_MAKE_VER(1,0,0)); + B_TRANSLATION_MAKE_VERSION(1,0,0)); } #endif // #if !TEST_R5 diff --git a/src/tests/add-ons/translators/pngtranslator/PNGTranslatorTest.cpp b/src/tests/add-ons/translators/pngtranslator/PNGTranslatorTest.cpp index 413d156ec7..2e230341a2 100644 --- a/src/tests/add-ons/translators/pngtranslator/PNGTranslatorTest.cpp +++ b/src/tests/add-ons/translators/pngtranslator/PNGTranslatorTest.cpp @@ -26,7 +26,7 @@ // PNG Translator Settings #define PNG_SETTING_INTERLACE "png /interlace" -#define PNG_TRANSLATOR_VERSION B_TRANSLATION_MAKE_VER(1,0,0) +#define PNG_TRANSLATOR_VERSION B_TRANSLATION_MAKE_VERSION(1,0,0) #define PNG_IN_QUALITY 0.8 #define PNG_IN_CAPABILITY 0.8 @@ -458,7 +458,7 @@ PNGTranslatorTest::LoadAddOnTest() this, gPNGInputFormats, sizeof(gPNGInputFormats) / sizeof(translation_format), gPNGOutputFormats, sizeof(gPNGOutputFormats) / sizeof(translation_format), - B_TRANSLATION_MAKE_VER(1,0,0)); + PNG_TRANSLATOR_VERSION); } #endif // #if !TEST_R5 diff --git a/src/tests/add-ons/translators/stxttranslator/STXTTranslatorTest.cpp b/src/tests/add-ons/translators/stxttranslator/STXTTranslatorTest.cpp index 6179475bb4..c9c452a8f0 100644 --- a/src/tests/add-ons/translators/stxttranslator/STXTTranslatorTest.cpp +++ b/src/tests/add-ons/translators/stxttranslator/STXTTranslatorTest.cpp @@ -472,7 +472,7 @@ STXTTranslatorTest::LoadAddOnTest() this, gSTXTInputFormats, sizeof(gSTXTInputFormats) / sizeof(translation_format), gSTXTOutputFormats, sizeof(gSTXTOutputFormats) / sizeof(translation_format), - B_TRANSLATION_MAKE_VER(1,0,0)); + B_TRANSLATION_MAKE_VERSION(1,0,0)); } #endif // #if !TEST_R5 diff --git a/src/tests/add-ons/translators/tgatranslator/TGATranslatorTest.cpp b/src/tests/add-ons/translators/tgatranslator/TGATranslatorTest.cpp index 69070d09dd..278ca3e815 100644 --- a/src/tests/add-ons/translators/tgatranslator/TGATranslatorTest.cpp +++ b/src/tests/add-ons/translators/tgatranslator/TGATranslatorTest.cpp @@ -612,7 +612,7 @@ TGATranslatorTest::LoadAddOnTest() this, gTGAInputFormats, sizeof(gTGAInputFormats) / sizeof(translation_format), gTGAOutputFormats, sizeof(gTGAOutputFormats) / sizeof(translation_format), - B_TRANSLATION_MAKE_VER(1,0,0)); + B_TRANSLATION_MAKE_VERSION(1,0,0)); } #endif // #if !TEST_R5 diff --git a/src/tests/add-ons/translators/tifftranslator/TIFFTranslatorTest.cpp b/src/tests/add-ons/translators/tifftranslator/TIFFTranslatorTest.cpp index 040547863e..3341b23680 100755 --- a/src/tests/add-ons/translators/tifftranslator/TIFFTranslatorTest.cpp +++ b/src/tests/add-ons/translators/tifftranslator/TIFFTranslatorTest.cpp @@ -468,7 +468,7 @@ TIFFTranslatorTest::LoadAddOnTest() this, gTIFFInputFormats, sizeof(gTIFFInputFormats) / sizeof(translation_format), gTIFFOutputFormats, sizeof(gTIFFOutputFormats) / sizeof(translation_format), - B_TRANSLATION_MAKE_VER(1,0,0)); + B_TRANSLATION_MAKE_VERSION(1,0,0)); } #endif // #if !TEST_R5