From 5d463c719bb2881d63da68d0752e4086c265876d Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Mon, 24 Jan 2011 16:34:14 +0100 Subject: vcl2gnumake: #i116589# header cleanup: linux,solaris,macos --- vcl/unx/kde4/KDEData.cxx | 2 +- vcl/unx/kde4/KDEData.hxx | 6 +++--- vcl/unx/kde4/KDESalDisplay.cxx | 2 +- vcl/unx/kde4/KDESalDisplay.hxx | 3 ++- vcl/unx/kde4/KDESalFrame.cxx | 11 +++++++---- vcl/unx/kde4/KDESalFrame.hxx | 6 +++--- vcl/unx/kde4/KDESalGraphics.cxx | 2 +- vcl/unx/kde4/KDESalGraphics.hxx | 6 +++--- vcl/unx/kde4/KDESalInstance.cxx | 2 +- vcl/unx/kde4/KDESalInstance.hxx | 4 ++-- vcl/unx/kde4/KDEXLib.cxx | 9 +++++---- vcl/unx/kde4/KDEXLib.hxx | 3 ++- vcl/unx/kde4/VCLKDEApplication.cxx | 2 +- vcl/unx/kde4/VCLKDEApplication.hxx | 2 +- 14 files changed, 33 insertions(+), 27 deletions(-) (limited to 'vcl/unx/kde4') diff --git a/vcl/unx/kde4/KDEData.cxx b/vcl/unx/kde4/KDEData.cxx index 99871edadae3..dcf1db32068e 100644 --- a/vcl/unx/kde4/KDEData.cxx +++ b/vcl/unx/kde4/KDEData.cxx @@ -51,4 +51,4 @@ void KDEData::initNWF() void KDEData::deInitNWF() { -} \ No newline at end of file +} diff --git a/vcl/unx/kde4/KDEData.hxx b/vcl/unx/kde4/KDEData.hxx index 7cf5836c9688..753deb697e95 100644 --- a/vcl/unx/kde4/KDEData.hxx +++ b/vcl/unx/kde4/KDEData.hxx @@ -27,8 +27,8 @@ #pragma once -#include -#include +#include +#include class KDEData : public X11SalData { @@ -39,4 +39,4 @@ class KDEData : public X11SalData virtual void Init(); virtual void initNWF(); virtual void deInitNWF(); -}; \ No newline at end of file +}; diff --git a/vcl/unx/kde4/KDESalDisplay.cxx b/vcl/unx/kde4/KDESalDisplay.cxx index d67399528a7c..41fa9fedde3f 100644 --- a/vcl/unx/kde4/KDESalDisplay.cxx +++ b/vcl/unx/kde4/KDESalDisplay.cxx @@ -42,4 +42,4 @@ SalKDEDisplay::~SalKDEDisplay() doDestruct(); // prevent SalDisplay from closing KApplication's display pDisp_ = NULL; -} \ No newline at end of file +} diff --git a/vcl/unx/kde4/KDESalDisplay.hxx b/vcl/unx/kde4/KDESalDisplay.hxx index 1ab966b1847b..8287bbfb9bda 100644 --- a/vcl/unx/kde4/KDESalDisplay.hxx +++ b/vcl/unx/kde4/KDESalDisplay.hxx @@ -27,7 +27,7 @@ #pragma once -#include +#include class SalKDEDisplay : public SalX11Display { @@ -35,3 +35,4 @@ class SalKDEDisplay : public SalX11Display SalKDEDisplay( Display* pDisp ); virtual ~SalKDEDisplay(); }; + diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx index 0c8f04f9fe41..6741fb7449ae 100644 --- a/vcl/unx/kde4/KDESalFrame.cxx +++ b/vcl/unx/kde4/KDESalFrame.cxx @@ -44,13 +44,14 @@ #include "KDEXLib.hxx" #include "KDESalGraphics.hxx" +#include + #include #include -#include -#include +#include -#include +#include #if OSL_DEBUG_LEVEL > 1 #include @@ -86,12 +87,14 @@ static OUString readEntryUntranslated( KConfigGroup *pGroup, const char *pKey ) return OUString::createFromAscii( (const char *) pGroup->readEntryUntranslated( pKey ).toAscii() ); } +#if 0 /** Helper function to read color from KConfig configuration repository. */ static Color readColor( KConfigGroup *pGroup, const char *pKey ) { return toColor( pGroup->readEntry( pKey, QColor(Qt::white) ) ); } +#endif /** Helper function to add information to Font from QFont. @@ -402,4 +405,4 @@ SalGraphics* KDESalFrame::GetGraphics() } return NULL; -} \ No newline at end of file +} diff --git a/vcl/unx/kde4/KDESalFrame.hxx b/vcl/unx/kde4/KDESalFrame.hxx index 643be72c27f3..a518017855cb 100644 --- a/vcl/unx/kde4/KDESalFrame.hxx +++ b/vcl/unx/kde4/KDESalFrame.hxx @@ -27,8 +27,8 @@ #pragma once -#include -#include +#include +#include class KDESalFrame : public X11SalFrame { @@ -55,4 +55,4 @@ class KDESalFrame : public X11SalFrame virtual void updateGraphics( bool bClear ); virtual void UpdateSettings( AllSettings& rSettings ); virtual void Show( BOOL bVisible, BOOL bNoActivate ); -}; \ No newline at end of file +}; diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx index 2c04af384c51..5a5cd11c52d9 100644 --- a/vcl/unx/kde4/KDESalGraphics.cxx +++ b/vcl/unx/kde4/KDESalGraphics.cxx @@ -556,7 +556,7 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, if (returnVal) { - GC gc = SelectFont(); + GC gc = GetFontGC(); if( gc ) { diff --git a/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx index 0bce1700f1fc..327ba0b3d464 100644 --- a/vcl/unx/kde4/KDESalGraphics.hxx +++ b/vcl/unx/kde4/KDESalGraphics.hxx @@ -28,8 +28,8 @@ #pragma once #include -#include -#include +#include +#include #define Region QtXRegion #include @@ -110,4 +110,4 @@ class KDESalGraphics : public X11SalGraphics const ImplControlValue& aValue, const rtl::OUString& aCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); -}; \ No newline at end of file +}; diff --git a/vcl/unx/kde4/KDESalInstance.cxx b/vcl/unx/kde4/KDESalInstance.cxx index 01c4723bd530..e06bf1a3cf7a 100644 --- a/vcl/unx/kde4/KDESalInstance.cxx +++ b/vcl/unx/kde4/KDESalInstance.cxx @@ -32,4 +32,4 @@ SalFrame* KDESalInstance::CreateFrame( SalFrame *pParent, ULONG nState ) { return new KDESalFrame( pParent, nState ); -} \ No newline at end of file +} diff --git a/vcl/unx/kde4/KDESalInstance.hxx b/vcl/unx/kde4/KDESalInstance.hxx index 7d050fe6819e..dc1e52b26717 100644 --- a/vcl/unx/kde4/KDESalInstance.hxx +++ b/vcl/unx/kde4/KDESalInstance.hxx @@ -27,7 +27,7 @@ #pragma once -#include +#include class SalYieldMutex; class SalFrame; @@ -38,4 +38,4 @@ class KDESalInstance : public X11SalInstance KDESalInstance( SalYieldMutex* pMutex ) : X11SalInstance( pMutex ) {} virtual ~KDESalInstance() {} virtual SalFrame* CreateFrame( SalFrame* pParent, ULONG nStyle ); -}; \ No newline at end of file +}; diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index 6a2793b8abe3..f60e84c0bc02 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -25,6 +25,8 @@ * ************************************************************************/ +#include + #include "VCLKDEApplication.hxx" #define Region QtXRegion @@ -39,11 +41,10 @@ #include "KDEXLib.hxx" -#include -#include +#include +#include -#include -#include +#include #include "KDESalDisplay.hxx" diff --git a/vcl/unx/kde4/KDEXLib.hxx b/vcl/unx/kde4/KDEXLib.hxx index 985e0c3c6717..561f6ee73a78 100644 --- a/vcl/unx/kde4/KDEXLib.hxx +++ b/vcl/unx/kde4/KDEXLib.hxx @@ -27,7 +27,7 @@ #pragma once -#include +#include class KDEXLib : public SalXLib { @@ -46,3 +46,4 @@ class KDEXLib : public SalXLib void doStartup(); }; + diff --git a/vcl/unx/kde4/VCLKDEApplication.cxx b/vcl/unx/kde4/VCLKDEApplication.cxx index 2cfb071e96ae..5e3a85256313 100644 --- a/vcl/unx/kde4/VCLKDEApplication.cxx +++ b/vcl/unx/kde4/VCLKDEApplication.cxx @@ -49,4 +49,4 @@ bool VCLKDEApplication::x11EventFilter(XEvent* event) } return false; -} \ No newline at end of file +} diff --git a/vcl/unx/kde4/VCLKDEApplication.hxx b/vcl/unx/kde4/VCLKDEApplication.hxx index 2edfddd69a9c..7cbbe38b61df 100644 --- a/vcl/unx/kde4/VCLKDEApplication.hxx +++ b/vcl/unx/kde4/VCLKDEApplication.hxx @@ -50,4 +50,4 @@ class VCLKDEApplication : public KApplication virtual bool x11EventFilter(XEvent* event); SalKDEDisplay* disp; -}; \ No newline at end of file +}; -- cgit From bb3127a8c053434ab1f4c42624b3d70a5fbfa9e6 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Tue, 25 Jan 2011 17:35:20 +0100 Subject: vcl2gnumake: #i116588# move vcl to gbuild (step 1, linux) --- vcl/unx/kde4/VCLKDEApplication.cxx | 4 ++-- vcl/unx/kde4/main.cxx | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'vcl/unx/kde4') diff --git a/vcl/unx/kde4/VCLKDEApplication.cxx b/vcl/unx/kde4/VCLKDEApplication.cxx index 5e3a85256313..94d28d2e698a 100644 --- a/vcl/unx/kde4/VCLKDEApplication.cxx +++ b/vcl/unx/kde4/VCLKDEApplication.cxx @@ -39,11 +39,11 @@ VCLKDEApplication::VCLKDEApplication() : disp = 0; } -bool VCLKDEApplication::x11EventFilter(XEvent* event) +bool VCLKDEApplication::x11EventFilter(XEvent* ev) { //if we have a display and the display consumes the event //do not process the event in qt - if (disp && disp->Dispatch(event) > 0) + if (disp && disp->Dispatch(ev) > 0) { return true; } diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx index 962a882af26b..063cdf2bef86 100644 --- a/vcl/unx/kde4/main.cxx +++ b/vcl/unx/kde4/main.cxx @@ -35,6 +35,8 @@ #include "KDEData.hxx" #include "KDESalInstance.hxx" +#include "vclpluginapi.h" + #if OSL_DEBUG_LEVEL > 1 #include #endif @@ -43,7 +45,7 @@ /// entry point for the KDE4 VCL plugin extern "C" { - VCL_DLLPUBLIC SalInstance* create_SalInstance( oslModule ) + VCLPLUG_KDE4_PUBLIC SalInstance* create_SalInstance( oslModule ) { /* #i92121# workaround deadlocks in the X11 implementation */ -- cgit From a9aa5e1feff13541cdf725f83c408d5c5d795591 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 28 Jan 2011 17:09:18 +0100 Subject: vcl2gnumake: #i116588# remove old makefiles --- vcl/unx/kde4/makefile.mk | 88 ------------------------------------------------ 1 file changed, 88 deletions(-) delete mode 100644 vcl/unx/kde4/makefile.mk (limited to 'vcl/unx/kde4') diff --git a/vcl/unx/kde4/makefile.mk b/vcl/unx/kde4/makefile.mk deleted file mode 100644 index fd1e9ca59236..000000000000 --- a/vcl/unx/kde4/makefile.mk +++ /dev/null @@ -1,88 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org 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 Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=vcl -TARGET=kde4plug -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# workaround for makedepend hang -MKDEPENDSOLVER= - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# For some of the included external KDE headers, GCC complains about shadowed -# symbols in instantiated template code only at the end of a compilation unit, -# so the only solution is to disable that warning here: -.IF "$(COM)" == "GCC" -CFLAGSCXX+=-Wno-shadow -.ENDIF - -# --- Files -------------------------------------------------------- - -.IF "$(GUIBASE)"!="unx" - -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)" - -.ELSE # "$(GUIBASE)"!="unx" - -.IF "$(ENABLE_KDE4)" != "" - -CFLAGS+=$(KDE4_CFLAGS) - -.IF "$(ENABLE_RANDR)" != "" -CDEFS+=-DUSE_RANDR -.ENDIF - -SLOFILES=\ - $(SLO)$/main.obj \ - $(SLO)$/VCLKDEApplication.obj \ - $(SLO)$/KDEXLib.obj \ - $(SLO)$/KDESalDisplay.obj \ - $(SLO)$/KDESalFrame.obj \ - $(SLO)$/KDESalGraphics.obj \ - $(SLO)$/KDESalInstance.obj \ - $(SLO)$/KDEData.obj - - -.ELSE # "$(ENABLE_KDE4)" != "" - -dummy: - @echo KDE disabled - nothing to build -.ENDIF -.ENDIF # "$(GUIBASE)"!="unx" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk -- cgit