Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Okular
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
John Zhang
Okular
Commits
5da7c5f7
Commit
5da7c5f7
authored
Oct 27, 2014
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
port to qCDebug. Autogenerate export headers
parent
8457b66b
Changes
42
Hide whitespace changes
Inline
Side-by-side
Showing
42 changed files
with
134 additions
and
209 deletions
+134
-209
CMakeLists.txt
CMakeLists.txt
+2
-0
conf/settings.kcfgc
conf/settings.kcfgc
+2
-2
conf/settings_core.kcfgc
conf/settings_core.kcfgc
+2
-2
core/action.h
core/action.h
+10
-10
core/annotations.h
core/annotations.h
+19
-19
core/area.h
core/area.h
+10
-10
core/audioplayer.h
core/audioplayer.h
+2
-2
core/bookmarkmanager.h
core/bookmarkmanager.h
+2
-2
core/document.h
core/document.h
+7
-7
core/document_p.h
core/document_p.h
+1
-1
core/fileprinter.h
core/fileprinter.h
+2
-2
core/fontinfo.h
core/fontinfo.h
+2
-2
core/form.h
core/form.h
+5
-5
core/generator.h
core/generator.h
+5
-5
core/misc.h
core/misc.h
+2
-2
core/movie.h
core/movie.h
+2
-2
core/observer.h
core/observer.h
+2
-2
core/okular_export.h
core/okular_export.h
+0
-33
core/page.h
core/page.h
+2
-2
core/pagesize.h
core/pagesize.h
+2
-2
core/pagetransition.h
core/pagetransition.h
+2
-2
core/sound.h
core/sound.h
+2
-2
core/sourcereference.h
core/sourcereference.h
+3
-3
core/textdocumentgenerator.h
core/textdocumentgenerator.h
+3
-3
core/textdocumentsettings.h
core/textdocumentsettings.h
+3
-3
core/textpage.h
core/textpage.h
+3
-3
core/tile.h
core/tile.h
+1
-1
core/tilesmanager_p.h
core/tilesmanager_p.h
+1
-1
core/utils.h
core/utils.h
+2
-2
core/view.h
core/view.h
+3
-3
generators/ooo/debug.h
generators/ooo/debug.h
+0
-16
generators/ooo/manifest.cpp
generators/ooo/manifest.cpp
+12
-12
generators/ooo/manifest.h
generators/ooo/manifest.h
+4
-0
interfaces/configinterface.h
interfaces/configinterface.h
+2
-2
interfaces/guiinterface.h
interfaces/guiinterface.h
+2
-2
interfaces/printinterface.h
interfaces/printinterface.h
+2
-2
interfaces/saveinterface.h
interfaces/saveinterface.h
+2
-2
interfaces/viewerinterface.h
interfaces/viewerinterface.h
+1
-1
okular_part_export.h
okular_part_export.h
+0
-33
part.h
part.h
+2
-2
shell/CMakeLists.txt
shell/CMakeLists.txt
+1
-0
ui/toc.h
ui/toc.h
+2
-2
No files found.
CMakeLists.txt
View file @
5da7c5f7
...
...
@@ -172,6 +172,7 @@ ki18n_wrap_ui(okularcore_SRCS
kconfig_add_kcfg_files
(
okularcore_SRCS conf/settings_core.kcfgc
)
add_library
(
okularcore SHARED
${
okularcore_SRCS
}
)
generate_export_header
(
okularcore BASE_NAME okularcore
)
# Special handling for linking okularcore on OSX/Apple
IF
(
APPLE
)
...
...
@@ -273,6 +274,7 @@ message("KF5: Enable ui/tts.cpp again")
#qt5_add_dbus_interfaces(okularpart_SRCS ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml)
add_library
(
okularpart MODULE
${
okularpart_SRCS
}
)
generate_export_header
(
okularpart BASE_NAME okularpart
)
target_link_libraries
(
okularpart okularcore Qt5::Svg KF5::Parts
${
MATH_LIB
}
Phonon::phonon4qt5 KF5::Solid
)
...
...
conf/settings.kcfgc
View file @
5da7c5f7
...
...
@@ -4,7 +4,7 @@ File=okular.kcfg
Inherits=SettingsCore
Mutators=true
Singleton=true
Visibility=OKULAR
_
PART_EXPORT
IncludeFiles=settings_core.h,okular
_
part_export.h
Visibility=OKULARPART_EXPORT
IncludeFiles=settings_core.h,okularpart_export.h
SourceIncludeFiles=qdom.h,QStandardPaths
MemberVariables=dpointer
conf/settings_core.kcfgc
View file @
5da7c5f7
...
...
@@ -3,6 +3,6 @@ NameSpace=Okular
File=okular_core.kcfg
Mutators=true
Singleton=true
Visibility=OKULAR_EXPORT
IncludeFiles=
core/okular
_export.h
Visibility=OKULAR
CORE
_EXPORT
IncludeFiles=
okularcore
_export.h
MemberVariables=dpointer
core/action.h
View file @
5da7c5f7
...
...
@@ -11,7 +11,7 @@
#define _OKULAR_ACTION_H_
#include "global.h"
#include "okular_export.h"
#include "okular
core
_export.h"
#include <QtCore/QString>
#include <QtCore/QVariant>
...
...
@@ -40,7 +40,7 @@ class DocumentViewport;
* widgets to reimplement the 'actionType' method and return the type of
* the action described by the reimplemented class.
*/
class
OKULAR_EXPORT
Action
class
OKULAR
CORE
_EXPORT
Action
{
public:
/**
...
...
@@ -112,7 +112,7 @@ class OKULAR_EXPORT Action
* The Goto action changes the viewport to another page
* or loads an external document.
*/
class
OKULAR_EXPORT
GotoAction
:
public
Action
class
OKULAR
CORE
_EXPORT
GotoAction
:
public
Action
{
public:
/**
...
...
@@ -178,7 +178,7 @@ class OKULAR_EXPORT GotoAction : public Action
/**
* The Execute action executes an external application.
*/
class
OKULAR_EXPORT
ExecuteAction
:
public
Action
class
OKULAR
CORE
_EXPORT
ExecuteAction
:
public
Action
{
public:
/**
...
...
@@ -223,7 +223,7 @@ class OKULAR_EXPORT ExecuteAction : public Action
* The Browse action browses an url by opening a web browser or
* email client, depedning on the url protocol (e.g. http, mailto, etc.).
*/
class
OKULAR_EXPORT
BrowseAction
:
public
Action
class
OKULAR
CORE
_EXPORT
BrowseAction
:
public
Action
{
public:
/**
...
...
@@ -262,7 +262,7 @@ class OKULAR_EXPORT BrowseAction : public Action
* The DocumentAction action contains an action that is performed on
* the current document.
*/
class
OKULAR_EXPORT
DocumentAction
:
public
Action
class
OKULAR
CORE
_EXPORT
DocumentAction
:
public
Action
{
public:
/**
...
...
@@ -320,7 +320,7 @@ class OKULAR_EXPORT DocumentAction : public Action
/**
* The Sound action plays a sound on activation.
*/
class
OKULAR_EXPORT
SoundAction
:
public
Action
class
OKULAR
CORE
_EXPORT
SoundAction
:
public
Action
{
public:
/**
...
...
@@ -384,7 +384,7 @@ class OKULAR_EXPORT SoundAction : public Action
*
* @since 0.7 (KDE 4.1)
*/
class
OKULAR_EXPORT
ScriptAction
:
public
Action
class
OKULAR
CORE
_EXPORT
ScriptAction
:
public
Action
{
public:
/**
...
...
@@ -429,7 +429,7 @@ class OKULAR_EXPORT ScriptAction : public Action
*
* @since 0.15 (KDE 4.9)
*/
class
OKULAR_EXPORT
MovieAction
:
public
Action
class
OKULAR
CORE
_EXPORT
MovieAction
:
public
Action
{
public:
/**
...
...
@@ -488,7 +488,7 @@ class OKULAR_EXPORT MovieAction : public Action
*
* @since 0.16 (KDE 4.10)
*/
class
OKULAR_EXPORT
RenditionAction
:
public
Action
class
OKULAR
CORE
_EXPORT
RenditionAction
:
public
Action
{
public:
/**
...
...
core/annotations.h
View file @
5da7c5f7
...
...
@@ -18,7 +18,7 @@
#include <QtXml/QDomDocument>
#include <QtXml/QDomElement>
#include "okular_export.h"
#include "okular
core
_export.h"
#include "area.h"
namespace
Okular
{
...
...
@@ -49,7 +49,7 @@ class WidgetAnnotationPrivate;
/**
* @short Helper class for (recursive) annotation retrieval/storage.
*/
class
OKULAR_EXPORT
AnnotationUtils
class
OKULAR
CORE
_EXPORT
AnnotationUtils
{
public:
/**
...
...
@@ -87,7 +87,7 @@ class OKULAR_EXPORT AnnotationUtils
* An Annotation is an object (text note, highlight, sound, popup window, ..)
* contained by a Page in the document.
*/
class
OKULAR_EXPORT
Annotation
class
OKULAR
CORE
_EXPORT
Annotation
{
/// @cond PRIVATE
friend
class
AnnotationObjectRect
;
...
...
@@ -302,7 +302,7 @@ class OKULAR_EXPORT Annotation
* The Style class contains all information about style of the
* annotation.
*/
class
OKULAR_EXPORT
Style
class
OKULAR
CORE
_EXPORT
Style
{
public:
/**
...
...
@@ -437,7 +437,7 @@ class OKULAR_EXPORT Annotation
* The Window class contains all information about the popup window
* of the annotation that is used to edit the content and properties.
*/
class
OKULAR_EXPORT
Window
class
OKULAR
CORE
_EXPORT
Window
{
public:
/**
...
...
@@ -683,7 +683,7 @@ class OKULAR_EXPORT Annotation
*
* @since 0.15 (KDE 4.9)
*/
class
OKULAR_EXPORT
AnnotationProxy
class
OKULAR
CORE
_EXPORT
AnnotationProxy
{
public:
enum
Capability
...
...
@@ -728,7 +728,7 @@ class OKULAR_EXPORT AnnotationProxy
virtual
void
notifyRemoval
(
Annotation
*
annotation
,
int
page
)
=
0
;
};
class
OKULAR_EXPORT
TextAnnotation
:
public
Annotation
class
OKULAR
CORE
_EXPORT
TextAnnotation
:
public
Annotation
{
public:
/**
...
...
@@ -853,7 +853,7 @@ class OKULAR_EXPORT TextAnnotation : public Annotation
Q_DISABLE_COPY
(
TextAnnotation
)
};
class
OKULAR_EXPORT
LineAnnotation
:
public
Annotation
class
OKULAR
CORE
_EXPORT
LineAnnotation
:
public
Annotation
{
public:
/**
...
...
@@ -1013,7 +1013,7 @@ class OKULAR_EXPORT LineAnnotation : public Annotation
Q_DISABLE_COPY
(
LineAnnotation
)
};
class
OKULAR_EXPORT
GeomAnnotation
:
public
Annotation
class
OKULAR
CORE
_EXPORT
GeomAnnotation
:
public
Annotation
{
public:
// common enums
...
...
@@ -1075,7 +1075,7 @@ class OKULAR_EXPORT GeomAnnotation : public Annotation
Q_DISABLE_COPY
(
GeomAnnotation
)
};
class
OKULAR_EXPORT
HighlightAnnotation
:
public
Annotation
class
OKULAR
CORE
_EXPORT
HighlightAnnotation
:
public
Annotation
{
public:
/**
...
...
@@ -1119,7 +1119,7 @@ class OKULAR_EXPORT HighlightAnnotation : public Annotation
* The Quad class contains 8 coordinates and style definitions
* which describe a line part of the whole highlight annotation.
*/
class
OKULAR_EXPORT
Quad
class
OKULAR
CORE
_EXPORT
Quad
{
public:
/**
...
...
@@ -1218,7 +1218,7 @@ class OKULAR_EXPORT HighlightAnnotation : public Annotation
Q_DISABLE_COPY
(
HighlightAnnotation
)
};
class
OKULAR_EXPORT
StampAnnotation
:
public
Annotation
class
OKULAR
CORE
_EXPORT
StampAnnotation
:
public
Annotation
{
public:
/**
...
...
@@ -1262,7 +1262,7 @@ class OKULAR_EXPORT StampAnnotation : public Annotation
Q_DISABLE_COPY
(
StampAnnotation
)
};
class
OKULAR_EXPORT
InkAnnotation
:
public
Annotation
class
OKULAR
CORE
_EXPORT
InkAnnotation
:
public
Annotation
{
public:
/**
...
...
@@ -1312,7 +1312,7 @@ class OKULAR_EXPORT InkAnnotation : public Annotation
Q_DISABLE_COPY
(
InkAnnotation
)
};
class
OKULAR_EXPORT
CaretAnnotation
:
public
Annotation
class
OKULAR
CORE
_EXPORT
CaretAnnotation
:
public
Annotation
{
public:
/**
...
...
@@ -1365,7 +1365,7 @@ class OKULAR_EXPORT CaretAnnotation : public Annotation
Q_DISABLE_COPY
(
CaretAnnotation
)
};
class
OKULAR_EXPORT
FileAttachmentAnnotation
:
public
Annotation
class
OKULAR
CORE
_EXPORT
FileAttachmentAnnotation
:
public
Annotation
{
public:
/**
...
...
@@ -1425,7 +1425,7 @@ class OKULAR_EXPORT FileAttachmentAnnotation : public Annotation
*
* @since 0.7 (KDE 4.1)
*/
class
OKULAR_EXPORT
SoundAnnotation
:
public
Annotation
class
OKULAR
CORE
_EXPORT
SoundAnnotation
:
public
Annotation
{
public:
/**
...
...
@@ -1485,7 +1485,7 @@ class OKULAR_EXPORT SoundAnnotation : public Annotation
*
* @since 0.8 (KDE 4.2)
*/
class
OKULAR_EXPORT
MovieAnnotation
:
public
Annotation
class
OKULAR
CORE
_EXPORT
MovieAnnotation
:
public
Annotation
{
public:
/**
...
...
@@ -1531,7 +1531,7 @@ class OKULAR_EXPORT MovieAnnotation : public Annotation
*
* @since 0.16 (KDE 4.10)
*/
class
OKULAR_EXPORT
ScreenAnnotation
:
public
Annotation
class
OKULAR
CORE
_EXPORT
ScreenAnnotation
:
public
Annotation
{
public:
/**
...
...
@@ -1600,7 +1600,7 @@ class OKULAR_EXPORT ScreenAnnotation : public Annotation
*
* @since 0.16 (KDE 4.10)
*/
class
OKULAR_EXPORT
WidgetAnnotation
:
public
Annotation
class
OKULAR
CORE
_EXPORT
WidgetAnnotation
:
public
Annotation
{
public:
/**
...
...
core/area.h
View file @
5da7c5f7
...
...
@@ -18,7 +18,7 @@
#include <math.h>
#include "global.h"
#include "okular_export.h"
#include "okular
core
_export.h"
class
QPolygonF
;
class
QRect
;
...
...
@@ -44,7 +44,7 @@ class NormalizedShape;
* That allows you to zoom the page by just multiplying the normalized points with the
* zoomed page size.
*/
class
OKULAR_EXPORT
NormalizedPoint
class
OKULAR
CORE
_EXPORT
NormalizedPoint
{
public:
/**
...
...
@@ -102,7 +102,7 @@ class OKULAR_EXPORT NormalizedPoint
* NormalizedRect is a helper class which stores the coordinates
* of a normalized rect, which is a rectangle of @see NormalizedPoints.
*/
class
OKULAR_EXPORT
NormalizedRect
class
OKULAR
CORE
_EXPORT
NormalizedRect
{
public:
/**
...
...
@@ -319,7 +319,7 @@ class OKULAR_EXPORT NormalizedRect
*/
double
bottom
;
};
KDE_DUMMY_QHASH_FUNCTION
(
NormalizedRect
)
//
KDE_DUMMY_QHASH_FUNCTION(NormalizedRect)
/**
* @short NormalizedRect that contains a reference to an object.
...
...
@@ -334,7 +334,7 @@ KDE_DUMMY_QHASH_FUNCTION(NormalizedRect)
* - Image : class Image : description of an image (n/a)
* - Annotation: class Annotation: description of an annotation
*/
class
OKULAR_EXPORT
ObjectRect
class
OKULAR
CORE
_EXPORT
ObjectRect
{
public:
/**
...
...
@@ -428,7 +428,7 @@ class OKULAR_EXPORT ObjectRect
/**
* This class describes the object rectangle for an annotation.
*/
class
OKULAR_EXPORT
AnnotationObjectRect
:
public
ObjectRect
class
OKULAR
CORE
_EXPORT
AnnotationObjectRect
:
public
ObjectRect
{
public:
/**
...
...
@@ -471,7 +471,7 @@ class OKULAR_EXPORT AnnotationObjectRect : public ObjectRect
/**
* This class describes the object rectangle for a source reference.
*/
class
OKULAR_EXPORT
SourceRefObjectRect
:
public
ObjectRect
class
OKULAR
CORE
_EXPORT
SourceRefObjectRect
:
public
ObjectRect
{
friend
class
ObjectRect
;
...
...
@@ -857,7 +857,7 @@ void RegularArea<NormalizedShape, Shape>::transform( const QTransform &matrix )
givePtr
(
(
*
this
)[
i
]
)
->
transform
(
matrix
);
}
class
OKULAR_EXPORT
RegularAreaRect
:
public
RegularArea
<
NormalizedRect
,
QRect
>
class
OKULAR
CORE
_EXPORT
RegularAreaRect
:
public
RegularArea
<
NormalizedRect
,
QRect
>
{
public:
RegularAreaRect
();
...
...
@@ -901,12 +901,12 @@ class HighlightAreaRect : public RegularAreaRect
/**
* Debug operator for normalized @p point.
*/
OKULAR_EXPORT
QDebug
operator
<<
(
QDebug
str
,
const
Okular
::
NormalizedPoint
&
point
);
OKULAR
CORE
_EXPORT
QDebug
operator
<<
(
QDebug
str
,
const
Okular
::
NormalizedPoint
&
point
);
/**
* Debug operator for normalized @p rect.
*/
OKULAR_EXPORT
QDebug
operator
<<
(
QDebug
str
,
const
Okular
::
NormalizedRect
&
rect
);
OKULAR
CORE
_EXPORT
QDebug
operator
<<
(
QDebug
str
,
const
Okular
::
NormalizedRect
&
rect
);
#endif
#endif
core/audioplayer.h
View file @
5da7c5f7
...
...
@@ -10,7 +10,7 @@
#ifndef _OKULAR_AUDIOPLAYER_H_
#define _OKULAR_AUDIOPLAYER_H_
#include "okular_export.h"
#include "okular
core
_export.h"
#include <QtCore/QObject>
...
...
@@ -27,7 +27,7 @@ class SoundAction;
* Singleton utility class to play sounds in documents using the KDE sound
* system.
*/
class
OKULAR_EXPORT
AudioPlayer
:
public
QObject
class
OKULAR
CORE
_EXPORT
AudioPlayer
:
public
QObject
{
Q_OBJECT
...
...
core/bookmarkmanager.h
View file @
5da7c5f7
...
...
@@ -12,7 +12,7 @@
#include <kbookmark.h>
#include "okular_export.h"
#include "okular
core
_export.h"
#include <kurl.h>
class
QAction
;
...
...
@@ -29,7 +29,7 @@ class DocumentViewport;
* This class is responsible for loading and saving the bookmarks using the
* proper format, and for working with them (eg querying, adding, removing).
*/
class
OKULAR_EXPORT
BookmarkManager
:
public
QObject
class
OKULAR
CORE
_EXPORT
BookmarkManager
:
public
QObject
{
Q_OBJECT
...
...
core/document.h
View file @
5da7c5f7
...
...
@@ -11,7 +11,7 @@
#ifndef _OKULAR_DOCUMENT_H_
#define _OKULAR_DOCUMENT_H_
#include "okular_export.h"
#include "okular
core
_export.h"
#include "area.h"
#include "global.h"
#include "pagesize.h"
...
...
@@ -67,7 +67,7 @@ class VisiblePageRect;
* The DocumentInfo structure can be filled in by generators to display
* metadata about the currently opened file.
*/
class
OKULAR_EXPORT
DocumentInfo
class
OKULAR
CORE
_EXPORT
DocumentInfo
{
friend
class
Document
;
...
...
@@ -185,7 +185,7 @@ class OKULAR_EXPORT DocumentInfo
* For a better understanding of hierarchies @see README.internals.png
* @see DocumentObserver, Page
*/
class
OKULAR_EXPORT
Document
:
public
QObject
class
OKULAR
CORE
_EXPORT
Document
:
public
QObject
{
Q_OBJECT
...
...
@@ -1122,7 +1122,7 @@ class OKULAR_EXPORT Document : public QObject
* data is broadcasted between observers to synchronize their viewports to get
* the 'I scroll one view and others scroll too' views.
*/
class
OKULAR_EXPORT
DocumentViewport
class
OKULAR
CORE
_EXPORT
DocumentViewport
{
public:
/**
...
...
@@ -1204,7 +1204,7 @@ class OKULAR_EXPORT DocumentViewport
* - URL: a URL to be open as destination; if set, no other Destination* or
* ExternalFileName entry is used
*/
class
OKULAR_EXPORT
DocumentSynopsis
:
public
QDomDocument
class
OKULAR
CORE
_EXPORT
DocumentSynopsis
:
public
QDomDocument
{
public:
/**
...
...
@@ -1228,7 +1228,7 @@ class OKULAR_EXPORT DocumentSynopsis : public QDomDocument
* about an embedded file, like its name, its description, the date of creation
* and modification, and the real data of the file.
*/
class
OKULAR_EXPORT
EmbeddedFile
class
OKULAR
CORE
_EXPORT
EmbeddedFile
{
public:
/**
...
...
@@ -1282,7 +1282,7 @@ class OKULAR_EXPORT EmbeddedFile
/**
* @short An area of a specified page
*/
class
OKULAR_EXPORT
VisiblePageRect
class
OKULAR
CORE
_EXPORT
VisiblePageRect
{
public:
/**
...
...
core/document_p.h
View file @
5da7c5f7
...
...
@@ -139,7 +139,7 @@ class DocumentPrivate
bool
canModifyExternalAnnotations
()
const
;
bool
canRemoveExternalAnnotations
()
const
;
void
warnLimitedAnnotSupport
();
OKULAR_EXPORT
static
QString
docDataFileName
(
const
KUrl
&
url
,
qint64
document_size
);
OKULAR
CORE
_EXPORT
static
QString
docDataFileName
(
const
KUrl
&
url
,
qint64
document_size
);
// Methods that implement functionality needed by undo commands
void
performAddPageAnnotation
(
int
page
,
Annotation
*
annotation
);
...
...
core/fileprinter.h
View file @
5da7c5f7
...
...
@@ -18,14 +18,14 @@
#include <QtCore/QString>
#include <QtPrintSupport/QPrinter>
#include "okular_export.h"
#include "okular
core
_export.h"
#include "generator.h"
class
QSize
;
namespace
Okular
{
class
OKULAR_EXPORT
FilePrinter
class
OKULAR
CORE
_EXPORT
FilePrinter
{
public:
...
...
core/fontinfo.h
View file @
5da7c5f7
...
...
@@ -15,7 +15,7 @@
#include <QtCore/QSharedDataPointer>
#include <QtCore/QString>
#include "okular_export.h"
#include "okular
core
_export.h"
namespace
Okular
{
...
...
@@ -24,7 +24,7 @@ class FontInfoPrivate;
/**
* @short A small class that represents the information of a font.
*/
class
OKULAR_EXPORT
FontInfo
class
OKULAR
CORE
_EXPORT
FontInfo
{
public:
typedef
QList
<
FontInfo
>
List
;
...
...
core/form.h
View file @
5da7c5f7
...
...
@@ -10,7 +10,7 @@
#ifndef _OKULAR_FORM_H_
#define _OKULAR_FORM_H_
#include "okular_export.h"
#include "okular
core
_export.h"
#include "area.h"
#include <QtCore/QStringList>
...
...
@@ -33,7 +33,7 @@ class FormFieldChoicePrivate;
* This is not meant to be used as a direct base for the form fields in a
* document, but its abstract subclasses are.
*/
class
OKULAR_EXPORT
FormField
class
OKULAR
CORE
_EXPORT
FormField
{
/// @cond PRIVATE
friend
class
Page
;
...
...
@@ -115,7 +115,7 @@ class OKULAR_EXPORT FormField
*
* @since 0.7 (KDE 4.1)
*/
class
OKULAR_EXPORT
FormFieldButton
:
public
FormField
class
OKULAR
CORE
_EXPORT
FormFieldButton
:
public
FormField
{
public:
/**
...
...
@@ -173,7 +173,7 @@ class OKULAR_EXPORT FormFieldButton : public FormField
* This is the base interface to reimplement to represent a text field, ie a
* field where the user insert text.
*/
class
OKULAR_EXPORT
FormFieldText
:
public
FormField
class
OKULAR
CORE
_EXPORT
FormFieldText
:
public
FormField
{
public:
/**
...
...
@@ -255,7 +255,7 @@ class OKULAR_EXPORT FormFieldText : public FormField
* field where the user can select one (of more) element(s) among a set of
* choices.
*/
class
OKULAR_EXPORT
FormFieldChoice
:
public
FormField
class
OKULAR
CORE
_EXPORT
FormFieldChoice
:
public
FormField
{
public:
/**
...
...
core/generator.h
View file @
5da7c5f7
...
...
@@ -12,7 +12,7 @@
#ifndef _OKULAR_GENERATOR_H_
#define _OKULAR_GENERATOR_H_
#include "okular_export.h"
#include "okular
core
_export.h"
#include "document.h"
#include "fontinfo.h"
#include "global.h"
...
...
@@ -73,7 +73,7 @@ class SourceReference;
* Every Generator can support 0 or more export formats which can be
* queried with @ref Generator::exportFormats().
*/
class
OKULAR_EXPORT
ExportFormat
class
OKULAR
CORE
_EXPORT
ExportFormat
{
public:
typedef
QList
<
ExportFormat
>
List
;
...
...
@@ -183,7 +183,7 @@ class OKULAR_EXPORT ExportFormat
*
* @see PrintInterface, ConfigInterface, GuiInterface
*/
class
OKULAR_EXPORT
Generator
:
public
QObject
class
OKULAR
CORE
_EXPORT
Generator
:
public
QObject
{
/// @cond PRIVATE
friend
class
PixmapGenerationThread
;
...
...
@@ -564,7 +564,7 @@ class OKULAR_EXPORT Generator : public QObject
/**
* @short Describes a pixmap type request.
*/
class
OKULAR_EXPORT
PixmapRequest
class
OKULAR
CORE
_EXPORT
PixmapRequest
{
friend
class
Document
;
friend
class
DocumentPrivate
;
...
...
@@ -686,7 +686,7 @@ Q_DECLARE_METATYPE(Okular::Generator::PrintError)
Q_DECLARE_INTERFACE
(
Okular
::
Generator
,
OkularGeneratorInterface_iid
)
#ifndef QT_NO_DEBUG_STREAM
OKULAR_EXPORT
QDebug
operator
<<
(
QDebug
str
,
const
Okular
::
PixmapRequest
&
req
);
OKULAR
CORE
_EXPORT
QDebug
operator
<<
(
QDebug
str
,
const
Okular
::
PixmapRequest
&
req
);
#endif
#endif
...
...
core/misc.h
View file @
5da7c5f7
...
...
@@ -10,7 +10,7 @@
#ifndef _OKULAR_MISC_H_
#define _OKULAR_MISC_H_
#include "okular_export.h"
#include "okular
core
_export.h"
#include "area.h"
namespace
Okular
{
...
...
@@ -33,7 +33,7 @@ namespace Okular {
3. Internally it that is related to the start cursor is always at it[0] while it related to end is it[1],
transition between meanings (itB/itE) is done with dir modifier;
*/
class
OKULAR_EXPORT
TextSelection
class
OKULAR
CORE
_EXPORT
TextSelection
{
public:
/**
...
...
core/movie.h
View file @
5da7c5f7
...
...
@@ -12,7 +12,7 @@
#define _OKULAR_MOVIE_H_
#include "global.h"
#include "okular_export.h"
#include "okular
core
_export.h"
#include <QtCore/QSize>
...
...
@@ -25,7 +25,7 @@ namespace Okular {
*
* @since 0.8 (KDE 4.2)
*/
class
OKULAR_EXPORT
Movie
class
OKULAR
CORE
_EXPORT
Movie
{
public:
/**
...
...
core/observer.h
View file @
5da7c5f7
...
...
@@ -13,7 +13,7 @@
#include <QtCore/QVector>
#include "okular_export.h"
#include "okular
core
_export.h"
namespace
Okular
{
...
...
@@ -25,7 +25,7 @@ class Page;
* Inherit this class and call Document->addObserver( yourClass ) to get
* notified of asynchronous events (new pixmap generated, or changed, etc..).
*/
class
OKULAR_EXPORT
DocumentObserver
class
OKULAR
CORE
_EXPORT
DocumentObserver
{
public:
DocumentObserver
();
...
...
core/okular_export.h
deleted