Browse Source

Removed long-deprecated DebugMarker.h header.

Use DebugOutput.h and DebugMessage class instead.
pull/107/head
Vladimír Vondruš 11 years ago
parent
commit
ae26266e25
  1. 1
      src/Magnum/CMakeLists.txt
  2. 58
      src/Magnum/DebugMarker.h
  3. 30
      src/Magnum/Test/DebugOutputGLTest.cpp

1
src/Magnum/CMakeLists.txt

@ -183,7 +183,6 @@ if(NOT TARGET_WEBGL)
if(BUILD_DEPRECATED)
list(APPEND Magnum_HEADERS
DebugMarker.h
DebugMessage.h)
endif()
endif()

58
src/Magnum/DebugMarker.h

@ -1,58 +0,0 @@
#ifndef Magnum_DebugMarker_h
#define Magnum_DebugMarker_h
/*
This file is part of Magnum.
Copyright © 2010, 2011, 2012, 2013, 2014, 2015
Vladimír Vondruš <mosra@centrum.cz>
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
/** @file
* @brief Class @ref Magnum::DebugMarker
* @deprecated Use @ref DebugOutput.h instead.
*/
#include "Magnum/DebugOutput.h"
#ifdef MAGNUM_BUILD_DEPRECATED
namespace Magnum {
/**
@copybrief DebugMessage
@deprecated Use @ref DebugMessage instead.
*/
class CORRADE_DEPRECATED("use DebugMessage instead") MAGNUM_EXPORT DebugMarker: public DebugMessage {
public:
/**
* @copybrief DebugMessage::insert()
* @deprecated Use @ref DebugMessage::insert() instead.
*/
static CORRADE_DEPRECATED("use DebugMessage::insert() instead") void mark(const std::string& string) {
insert(Source::Application, Type::Marker, 0, DebugOutput::Severity::Notification, string);
}
};
}
#else
#error use DebugMessage.h instead
#endif
#endif

30
src/Magnum/Test/DebugOutputGLTest.cpp

@ -30,10 +30,6 @@
#include "Magnum/Extensions.h"
#include "Magnum/Test/AbstractOpenGLTester.h"
#ifdef MAGNUM_BUILD_DEPRECATED
#include "Magnum/DebugMarker.h"
#endif
namespace Magnum { namespace Test {
struct DebugOutputGLTest: AbstractOpenGLTester {
@ -49,10 +45,6 @@ struct DebugOutputGLTest: AbstractOpenGLTester {
void groupNoOp();
void group();
void groupFallback();
#ifdef MAGNUM_BUILD_DEPRECATED
void deprecated();
#endif
};
DebugOutputGLTest::DebugOutputGLTest() {
@ -65,12 +57,7 @@ DebugOutputGLTest::DebugOutputGLTest() {
&DebugOutputGLTest::groupNoOp,
&DebugOutputGLTest::group,
&DebugOutputGLTest::groupFallback,
#ifdef MAGNUM_BUILD_DEPRECATED
&DebugOutputGLTest::deprecated
#endif
});
&DebugOutputGLTest::groupFallback});
}
void DebugOutputGLTest::setCallback() {
@ -186,21 +173,6 @@ void DebugOutputGLTest::groupFallback() {
MAGNUM_VERIFY_NO_ERROR();
}
#ifdef MAGNUM_BUILD_DEPRECATED
void DebugOutputGLTest::deprecated() {
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
DebugMarker::mark("hello");
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
MAGNUM_VERIFY_NO_ERROR();
}
#endif
}}
CORRADE_TEST_MAIN(Magnum::Test::DebugOutputGLTest)

Loading…
Cancel
Save