root
/
dtkwidget
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove libdui_global.h 

Change-Id: I098e9cce5a1154570fcbca8af260325f3193514c
This commit is contained in:
Iceyer 2016-04-28 11:01:34 +08:00
parent b9e670b86c
commit ea4f72786e
Notes: Deepin Code Review 2017-07-26 13:08:52 +08:00 
Verified+1: Anonymous Coward #1000004
Code-Review+2: Iceyer <me@iceyer.net>
Submitted-by: Iceyer <me@iceyer.net>
Submitted-at: Thu, 28 Apr 2016 14:27:33 +0800
Reviewed-on: https://cr.deepin.io/12309
Project: dtkwidget
Branch: refs/heads/master
69 changed files with 123 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dwidget/dwidget.pro
View File

@ -12,9 +12,9 @@ unix{
QT += x11extras dbus
}
HEADERS += libdui_global.h
HEADERS += dwidget_global.h
includes.path = $${DTK_INCLUDEPATH}/DWidget
includes.files += libdui_global.h widgets/*.h
includes.files += dwidget_global.h widgets/*.h
includes.files += widgets/DTitlebar \
widgets/DWindow \
widgets/DMenu \

55
dwidget/dwidget_global.h
View File

@ -1 +1,54 @@
#include "libdui_global.h"
/**
* Copyright (C) 2015 Deepin Technology Co., Ltd.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
**/
#pragma once
#include <dtk_global.h>
#include <QtCore/QMetaMethod>
#define DWIDGET_NAMESPACE Widget
#define DTK_WIDGET_NAMESPACE DTK_NAMESPACE::Widget
# define DWIDGET_BEGIN_NAMESPACE namespace DTK_NAMESPACE { namespace DWIDGET_NAMESPACE {
# define DWIDGET_END_NAMESPACE }}
# define DWIDGET_USE_NAMESPACE using namespace DTK_WIDGET_NAMESPACE;
namespace Dtk
{
namespace Widget
{
}
}
#if defined(LIBDTKWIDGET_LIBRARY)
# define LIBDTKWIDGETSHARED_EXPORT Q_DECL_EXPORT
#else
# define LIBDTKWIDGETSHARED_EXPORT Q_DECL_IMPORT
#endif
#define DTKWIDGET_DECL_DEPRECATED Q_DECL_DEPRECATED
#define D_THEME_INIT_WIDGET(className, ...) \
DThemeManager * manager = DThemeManager::instance(); \
this->setStyleSheet(this->styleSheet() + manager->getQssForWidget(#className)); \
connect(manager, &DThemeManager::themeChanged, [=](QString) { \
this->setStyleSheet(manager->getQssForWidget(#className)); \
});\
QStringList list = QString(#__VA_ARGS__).replace(" ", "").split(",");\
const QMetaObject *self = metaObject();\
foreach (const QString &str, list) {\
if(str.isEmpty())\
continue;\
connect(this, self->property(self->indexOfProperty(str.toLatin1().data())).notifySignal(),\
manager, manager->metaObject()->method(manager->metaObject()->indexOfMethod("updateQss()")));\
}

54
dwidget/libdui_global.h
View File

@ -1,54 +0,0 @@
/**
* Copyright (C) 2015 Deepin Technology Co., Ltd.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
**/
#pragma once
#include <dtk_global.h>
#include <QtCore/QMetaMethod>
#define DWIDGET_NAMESPACE Widget
#define DTK_WIDGET_NAMESPACE DTK_NAMESPACE::Widget
# define DWIDGET_BEGIN_NAMESPACE namespace DTK_NAMESPACE { namespace DWIDGET_NAMESPACE {
# define DWIDGET_END_NAMESPACE }}
# define DWIDGET_USE_NAMESPACE using namespace DTK_WIDGET_NAMESPACE;
namespace Dtk
{
namespace Widget
{
}
}
#if defined(LIBDTKWIDGET_LIBRARY)
# define LIBDTKWIDGETSHARED_EXPORT Q_DECL_EXPORT
#else
# define LIBDTKWIDGETSHARED_EXPORT Q_DECL_IMPORT
#endif
#define DTKWIDGET_DECL_DEPRECATED Q_DECL_DEPRECATED
#define D_THEME_INIT_WIDGET(className, ...) \
DThemeManager * manager = DThemeManager::instance(); \
this->setStyleSheet(this->styleSheet() + manager->getQssForWidget(#className)); \
connect(manager, &DThemeManager::themeChanged, [=](QString) { \
this->setStyleSheet(manager->getQssForWidget(#className)); \
});\
QStringList list = QString(#__VA_ARGS__).replace(" ", "").split(",");\
const QMetaObject *self = metaObject();\
foreach (const QString &str, list) {\
if(str.isEmpty())\
continue;\
connect(this, self->property(self->indexOfProperty(str.toLatin1().data())).notifySignal(),\
manager, manager->metaObject()->method(manager->metaObject()->indexOfMethod("updateQss()")));\
}

2
dwidget/widgets/anchors.h
View File

@ -17,7 +17,7 @@
#include <QWidget>
#include <QDebug>
#include "libdui_global.h"
#include "dwidget_global.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dabstractdialog.h
View File

@ -13,7 +13,7 @@
#include <QDialog>
#include <QPoint>
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dobject.h"
class QMouseEvent;

2
dwidget/widgets/daction.h
View File

@ -2,7 +2,7 @@
#define DACTION_H
#include <DObject>
#include <libdui_global.h>
#include <dwidget_global.h>
#include <QAction>

2
dwidget/widgets/dapplication.h
View File

@ -12,7 +12,7 @@
#include <QApplication>
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dobject.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/darrowbutton.h
View File

@ -17,7 +17,7 @@
#include <QState>
#include <QDebug>
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dconstants.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/darrowlineexpand.h
View File

@ -12,7 +12,7 @@
#include <QWidget>
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dbaseexpand.h"
#include "darrowbutton.h"
#include "dbaseline.h"

2
dwidget/widgets/darrowrectangle.h
View File

@ -20,7 +20,7 @@
#include <QTimer>
#include <QDebug>
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dthememanager.h"
#include "dgraphicsgloweffect.h"

2
dwidget/widgets/dbasebutton.h
View File

@ -13,7 +13,7 @@
#include <QFrame>
#include <QHBoxLayout>
#include <QPushButton>
#include "libdui_global.h"
#include "dwidget_global.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dbaseexpand.h
View File

@ -15,7 +15,7 @@
#include <QVBoxLayout>
#include <QPropertyAnimation>
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dseparatorhorizontal.h"
#include "dconstants.h"

2
dwidget/widgets/dbaseline.h
View File

@ -14,7 +14,7 @@
#include <QLabel>
#include <QHBoxLayout>
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dconstants.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dboxwidget.h
View File

@ -10,7 +10,7 @@
#ifndef DBOXWIDGET_H
#define DBOXWIDGET_H
#include "libdui_global.h"
#include "dwidget_global.h"
#include <dobject.h>

2
dwidget/widgets/dbuttongrid.h
View File

@ -14,7 +14,7 @@
#include <QPushButton>
#include <QResizeEvent>
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dconstants.h"
#include "dimagebutton.h"

2
dwidget/widgets/dbuttonlist.h
View File

@ -12,7 +12,7 @@
#include <QListWidget>
#include <QPushButton>
#include "libdui_global.h"
#include "dwidget_global.h"
class QButtonGroup;
class QLabel;

2
dwidget/widgets/dcalendar.h
View File

@ -17,7 +17,7 @@
#include <QSize>
#include <QPropertyAnimation>
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dlinkbutton.h"
#include "dimagebutton.h"

2
dwidget/widgets/dcheckbox.h
View File

@ -12,7 +12,7 @@
#include <QCheckBox>
#include "libdui_global.h"
#include "dwidget_global.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dcircleprogress.h
View File

@ -10,7 +10,7 @@
#ifndef DCIRCLEPROGRESS_H
#define DCIRCLEPROGRESS_H
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dthememanager.h"
#include "dobject.h"

2
dwidget/widgets/dcolorcombobox.h
View File

@ -21,7 +21,7 @@
#include <QModelIndex>
#include <QColor>
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dcomboboxmodel.h"
#include "dcombobox.h"
#include "dabstractcomboboxdelegate.h"

2
dwidget/widgets/dcolorpicker.h
View File

@ -13,7 +13,7 @@
#include <QFrame>
#include <QGridLayout>
#include <QColor>
#include "libdui_global.h"
#include "dwidget_global.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dcombobox.h
View File

@ -18,7 +18,7 @@
#include <QAbstractItemView>
#include <QPointer>
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dobject.h"
#include "dconstants.h"
#include "dcomboboxmodel.h"

2
dwidget/widgets/dcomboboxmodel.h
View File

@ -17,7 +17,7 @@
#include <QJsonArray>
#include <QDebug>
#include "libdui_global.h"
#include "dwidget_global.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dconstants.h
View File

@ -18,7 +18,7 @@
#ifndef DCONSTANTS_H
#define DCONSTANTS_H
#include "libdui_global.h"
#include "dwidget_global.h"
DWIDGET_BEGIN_NAMESPACE
//basis width and height

2
dwidget/widgets/denhancedwidget.h
View File

@ -12,7 +12,7 @@
#include <QWidget>
#include "libdui_global.h"
#include "dwidget_global.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dexpandgroup.h
View File

@ -14,7 +14,7 @@
#include <QList>
#include <QMap>
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dbaseexpand.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dflowlayout.h
View File

@ -10,7 +10,7 @@
#ifndef DFLOWLAYOUT_H
#define DFLOWLAYOUT_H
#include "libdui_global.h"
#include "dwidget_global.h"
#include <dobject.h>

2
dwidget/widgets/dfontcombobox.h
View File

@ -20,7 +20,7 @@
#include <QCursor>
#include <QColor>
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dcombobox.h"
#include "dcomboboxmodel.h"
#include "dabstractcomboboxdelegate.h"

2
dwidget/widgets/dgraphicsgloweffect.h
View File

@ -14,7 +14,7 @@
#include <QGraphicsEffect>
#include <QPainter>
#include "libdui_global.h"
#include "dwidget_global.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dheaderline.h
View File

@ -13,7 +13,7 @@
#include <QWidget>
#include <QLabel>
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dbaseline.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dialog_constants.h
View File

@ -10,7 +10,7 @@
#ifndef BUTTON_CONSTANTS_H
#define BUTTON_CONSTANTS_H
#include "libdui_global.h"
#include "dwidget_global.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dimagebutton.h
View File

@ -15,7 +15,7 @@
#include <QLabel>
#include <QPixmap>
#include "libdui_global.h"
#include "dwidget_global.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dlabel.h
View File

@ -13,7 +13,7 @@
#include <QLabel>
#include "libdui_global.h"
#include "dwidget_global.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dlineedit.h
View File

@ -12,7 +12,7 @@
#include <QLineEdit>
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dobject.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dlinkbutton.h
View File

@ -12,7 +12,7 @@
#include <QPushButton>
#include "libdui_global.h"
#include "dwidget_global.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dlistview.h
View File

@ -10,7 +10,7 @@
#ifndef DLISTVIEW_H
#define DLISTVIEW_H
#include "libdui_global.h"
#include "dwidget_global.h"
#include <dobject.h>

2
dwidget/widgets/dlistwidget.h
View File

@ -14,7 +14,7 @@
#include <QBoxLayout>
#include "dscrollarea.h"
#include "libdui_global.h"
#include "dwidget_global.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dloadingindicator.h
View File

@ -22,7 +22,7 @@
#include <QEasingCurve>
#include <QDebug>
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dobject.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dmenu.h
View File

@ -3,7 +3,7 @@
#include <DObject>
#include <DAction>
#include <libdui_global.h>
#include <dwidget_global.h>
#include <QObject>

2
dwidget/widgets/doption.cpp
View File

@ -8,7 +8,7 @@
**/
#include "doption.h"
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dthememanager.h"
#include "private/doption_p.h"

2
dwidget/widgets/doption.h
View File

@ -10,7 +10,7 @@
#ifndef DOPTION_H
#define DOPTION_H
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dobject.h"
#include <QFrame>

2
dwidget/widgets/doptionlist.cpp
View File

@ -9,7 +9,7 @@
#include "doptionlist.h"
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dthememanager.h"
#include "private/doptionlist_p.h"

2
dwidget/widgets/doptionlist.h
View File

@ -10,7 +10,7 @@
#ifndef DOPTIONLIST_H
#define DOPTIONLIST_H
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dobject.h"
#include "doption.h"

2
dwidget/widgets/dpicturesequenceview.h
View File

@ -10,7 +10,7 @@
#ifndef DPICTURESEQUENCEVIEW_H
#define DPICTURESEQUENCEVIEW_H
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dobject.h"
#include <QGraphicsView>

2
dwidget/widgets/dscrollarea.h
View File

@ -12,7 +12,7 @@
#include <QScrollArea>
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dobject.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dscrollbar.h
View File

@ -12,7 +12,7 @@
#include <QScrollBar>
#include "libdui_global.h"
#include "dwidget_global.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dsearchedit.h
View File

@ -15,7 +15,7 @@
#include <QLineEdit>
#include <QPropertyAnimation>
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dimagebutton.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dsegmentedcontrol.h
View File

@ -16,7 +16,7 @@
#include <QPropertyAnimation>
#include <QList>
#include <QEasingCurve>
#include "libdui_global.h"
#include "dwidget_global.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dseparatorhorizontal.h
View File

@ -13,7 +13,7 @@
#include <QWidget>
#include <QVBoxLayout>
#include "libdui_global.h"
#include "dwidget_global.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dseparatorvertical.h
View File

@ -13,7 +13,7 @@
#include <QWidget>
#include <QHBoxLayout>
#include "libdui_global.h"
#include "dwidget_global.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dshortcutedit.h
View File

@ -17,7 +17,7 @@
#include <QColor>
#include <QMap>
#include "libdui_global.h"
#include "dwidget_global.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dsimplecombobox.h
View File

@ -12,7 +12,7 @@
#include <QWidget>
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dcomboboxmodel.h"
#include "dabstractcomboboxdelegate.h"
#include "dcombobox.h"

2
dwidget/widgets/dslider.h
View File

@ -12,7 +12,7 @@
#include <QSlider>
#include "libdui_global.h"
#include "dwidget_global.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dspinbox.h
View File

@ -12,7 +12,7 @@
#include <QSpinBox>
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dobject.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dstackwidget.h
View File

@ -14,7 +14,7 @@
#include <QVariantAnimation>
#include "dobject.h"
#include "libdui_global.h"
#include "dwidget_global.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dswitchbutton.h
View File

@ -14,7 +14,7 @@
#include <QPixmap>
#include <QVariantAnimation>
#include <QUrl>
#include "libdui_global.h"
#include "dwidget_global.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dswitchlineexpand.h
View File

@ -12,7 +12,7 @@
#include <QWidget>
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dbaseexpand.h"
#include "dswitchbutton.h"
#include "dheaderline.h"

2
dwidget/widgets/dtextbutton.h
View File

@ -13,7 +13,7 @@
#include <QPushButton>
#include <QPainter>
#include "libdui_global.h"
#include "dwidget_global.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dtextedit.h
View File

@ -1,7 +1,7 @@
#ifndef DTEXTEDIT_H
#define DTEXTEDIT_H
#include "libdui_global.h"
#include "dwidget_global.h"
#include <dobject.h>

2
dwidget/widgets/dthememanager.h
View File

@ -14,7 +14,7 @@
#include <QString>
#include <QGlobalStatic>
#include "libdui_global.h"
#include "dwidget_global.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dtitlebar.h
View File

@ -3,7 +3,7 @@
#include <QWidget>
#include <dobject.h>
#include "libdui_global.h"
#include "dwidget_global.h"
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/dwidget.h
View File

@ -3,7 +3,7 @@
#include <QWidget>
#include <dobject.h>
#include <libdui_global.h>
#include <dwidget_global.h>
#include <dx11widget.h>

2
dwidget/widgets/dwindow.cpp
View File

@ -22,7 +22,7 @@ DWindowPrivate::DWindowPrivate(DWindow *q): DWidgetPrivate(q)
}
DWindow::DWindow(DWidget *parent): DWidget(*(new DWindowPrivate(this)), parent)
DWindow::DWindow(QWidget *parent): DWidget(*(new DWindowPrivate(this)), parent)
{
D_D(DWindow);
d->dbusMenu = new DMenu;

4
dwidget/widgets/dwindow.h
View File

@ -3,7 +3,7 @@
#include <QWidget>
#include <dobject.h>
#include <libdui_global.h>
#include <dwidget_global.h>
#include "dwidget.h"
#include <DMenu>
@ -17,7 +17,7 @@ class LIBDTKWIDGETSHARED_EXPORT DWindow : public DWidget
{
Q_OBJECT
public:
explicit DWindow(DWidget *parent = 0);
explicit DWindow(QWidget *parent = 0);
DMenu *dbusMenu();

2
dwidget/widgets/dx11widget.h
View File

@ -3,7 +3,7 @@
#include <QWidget>
#include <dobject.h>
#include <libdui_global.h>
#include <dwidget_global.h>
DWIDGET_BEGIN_NAMESPACE

2
dwidget/widgets/private/dscrollarea_p.h
View File

@ -10,7 +10,7 @@
#ifndef DSCROLLAREA_P_H
#define DSCROLLAREA_P_H
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dscrollarea.h"
#include <private/dobject_p.h>

2
examples/dwidget-examples/collections/buttontab.h
View File

@ -13,7 +13,7 @@
#include <QWidget>
#include <QLabel>
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dtextbutton.h"
#include "dimagebutton.h"
#include "dheaderline.h"

2
examples/dwidget-examples/collections/mainwindow.cpp
View File

@ -14,7 +14,7 @@
#include "dslider.h"
#include "dthememanager.h"
#include "libdui_global.h"
#include "dwidget_global.h"
#include "dswitchbutton.h"
#include "segmentedcontrol.h"
#include "dcolorpicker.h"

2
examples/dwidget-examples/collections/segmentedcontrol.h
View File

@ -12,7 +12,7 @@
#include <QFrame>
#include "dsegmentedcontrol.h"
#include "libdui_global.h"
#include "dwidget_global.h"
DWIDGET_USE_NAMESPACE