Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 6faecbba authored by Laurent Montel's avatar Laurent Montel 😁

Remove kdemacros.h

parent 85900d7d
......@@ -11,7 +11,7 @@ set(libpala_SRCS
slicerpropertyset.cpp
)
set(libpala_HDRS
libpalamacros.h
${CMAKE_CURRENT_BINARY_DIR}/libpala_export.h
slicer.h
slicerjob.h
slicermode.h
......@@ -27,6 +27,7 @@ set(libpala_FANCY_HDRS
)
add_library(pala SHARED ${libpala_SRCS})
generate_export_header(pala BASE_NAME libpala)
target_link_libraries(pala KF5::KDELibs4Support Qt5::Gui)
set_target_properties(pala PROPERTIES
VERSION ${libpala_VERSION}
......
/***************************************************************************
* Copyright 2009 Stefan Majewsky <majewsky@gmx.net>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
***************************************************************************/
#ifndef LIBPALA_MACROS_H
#define LIBPALA_MACROS_H
#include <kdemacros.h>
#ifndef LIBPALA_EXPORT
# if defined(MAKE_LIBPALA)
# define LIBPALA_EXPORT KDE_EXPORT
# else
# define LIBPALA_EXPORT KDE_IMPORT
# endif
#endif
#endif // LIBPALA_MACROS_H
......@@ -20,9 +20,9 @@
#define LIBPALA_SLICER_H
#if defined(MAKE_LIBPALA) || defined(USE_LOCAL_LIBPALA)
# include "libpalamacros.h"
# include "libpala_export.h"
#else
# include <libpala/libpalamacros.h>
# include <libpala/libpala_export.h>
#endif
#include <QtCore/QObject>
......@@ -96,7 +96,7 @@ K_EXPORT_PLUGIN(MySlicerFactory("myslicer"))
//BIC: constify method
//This class is the only interface that slicers can use to communicate with Palapeli, and it is only instantiated very few times (one instance per slicer plugin), so it should be reasonable to reserve some space in the virtual table for future additions.
RESERVE_VIRTUAL_5
//RESERVE_VIRTUAL_5
protected:
///Add the given property to the property list of this slicer. The slicer will take care of destructing the given Pala::SlicerProperty instance when it is destructed.
///Use this method in the subclass constructors to fill the slicer with properties. Properties let the user control how the slicing is done.
......
......@@ -20,9 +20,9 @@
#define LIBPALA_SLICERJOB_H
#if defined(MAKE_LIBPALA) || defined(USE_LOCAL_LIBPALA)
# include "libpalamacros.h"
# include "libpala_export.h"
#else
# include <libpala/libpalamacros.h>
# include <libpala/libpala_export.h>
#endif
#include <QtCore/QMap>
......
......@@ -20,9 +20,9 @@
#define LIBPALA_SLICERMODE_H
#if defined(MAKE_LIBPALA) || defined(USE_LOCAL_LIBPALA)
# include "libpalamacros.h"
# include "libpala_export.h"
#else
# include <libpala/libpalamacros.h>
# include <libpala/libpala_export.h>
#endif
#include <QtCore/QByteArray>
......@@ -64,7 +64,7 @@ namespace Pala
void setPropertyEnabled(const QByteArray& property, bool enabled);
//Some space in the vtable reserved for future additions
RESERVE_VIRTUAL_5
//RESERVE_VIRTUAL_5
private:
class Private;
Private* const p;
......
......@@ -20,9 +20,9 @@
#define LIBPALA_SLICERPROPERTY_H
#if defined(MAKE_LIBPALA) || defined(USE_LOCAL_LIBPALA)
# include "libpalamacros.h"
# include "libpala_export.h"
#else
# include <libpala/libpalamacros.h>
# include <libpala/libpala_export.h>
#endif
#include <QtCore/QPair>
......
......@@ -20,9 +20,9 @@
#define LIBPALA_SLICERPROPERTYSET_H
#if defined(MAKE_LIBPALA) || defined(USE_LOCAL_LIBPALA)
# include "libpalamacros.h"
# include "libpala_export.h"
#else
# include <libpala/libpalamacros.h>
# include <libpala/libpala_export.h>
#endif
class QByteArray;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment