Sync r814568 from oxygen.
svn path=/trunk/KDE/kdebase/workspace/; revision=842508
This commit is contained in:
parent
cedaf94370
commit
a82450af5e
3 changed files with 6 additions and 3 deletions
|
@ -24,8 +24,8 @@
|
|||
// IN THE SOFTWARE.
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "oxygenclient.h"
|
||||
#include "oxygen.h"
|
||||
#include "oxygenclient.h"
|
||||
#include <kconfiggroup.h>
|
||||
|
||||
extern "C"
|
||||
|
|
|
@ -24,6 +24,9 @@
|
|||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
// IN THE SOFTWARE.
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "oxygenbutton.h"
|
||||
|
||||
#include <math.h>
|
||||
#include <QPainterPath>
|
||||
#include <QPainter>
|
||||
|
@ -37,7 +40,6 @@
|
|||
#include <KColorScheme>
|
||||
|
||||
#include "oxygenclient.h"
|
||||
#include "oxygenbutton.h"
|
||||
#include "oxygen.h"
|
||||
|
||||
namespace Ozone
|
||||
|
|
|
@ -27,6 +27,8 @@
|
|||
// #ifndef OXYGENCLIENT_H
|
||||
// #define OXYGENCLIENT_H
|
||||
|
||||
#include "oxygenclient.h"
|
||||
|
||||
#include <KConfig>
|
||||
#include <KGlobal>
|
||||
#include <KLocale>
|
||||
|
@ -52,7 +54,6 @@
|
|||
|
||||
#include "math.h"
|
||||
|
||||
#include "oxygenclient.h"
|
||||
#include "oxygenclient.moc"
|
||||
#include "oxygenbutton.h"
|
||||
#include "oxygen.h"
|
||||
|
|
Loading…
Reference in a new issue