[Libreoffice-commits] .: 3 commits - dbaccess/source fpicker/Library_fps_kde4.mk fpicker/Module_fpicker.mk fpicker/Package_kde4_moc.mk fpicker/source vcl/unx
Lubos Lunak
llunak at kemper.freedesktop.org
Fri Mar 16 12:59:15 PDT 2012
dbaccess/source/ui/misc/charsets.cxx | 2 -
fpicker/Library_fps_kde4.mk | 8 -------
fpicker/Module_fpicker.mk | 1
fpicker/Package_kde4_moc.mk | 36 -----------------------------------
fpicker/source/unx/kde4/Makefile | 35 ----------------------------------
vcl/unx/kde4/KDESalGraphics.cxx | 2 -
6 files changed, 2 insertions(+), 82 deletions(-)
New commits:
commit 43a56ce0cbed9187658340d0d4fbfa76c2c83d1b
Author: LuboÅ¡ LuÅák <l.lunak at suse.cz>
Date: Fri Mar 16 20:57:07 2012 +0100
remove extraneous parentheses
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 0be12fb..80c38ec 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -306,7 +306,7 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
draw( QStyle::CE_PushButton, &option, m_image,
vclStateValue2StateFlag(nControlState, value) );
}
- else if ( (type == CTRL_MENUBAR))
+ else if (type == CTRL_MENUBAR)
{
if (part == PART_MENU_ITEM)
{
commit cd131c6366a2ee70d15fc4d4794ddf62b8db646e
Author: LuboÅ¡ LuÅák <l.lunak at suse.cz>
Date: Fri Mar 16 20:36:14 2012 +0100
kde4 fpicker doesn't use Q_OBJECT, no need for moc
diff --git a/fpicker/Library_fps_kde4.mk b/fpicker/Library_fps_kde4.mk
index d806737..7c3e95f 100644
--- a/fpicker/Library_fps_kde4.mk
+++ b/fpicker/Library_fps_kde4.mk
@@ -27,10 +27,6 @@
$(eval $(call gb_Library_Library,fps_kde4))
-$(eval $(call gb_Library_add_package_headers,fps_kde4,\
- fpicker_kde4_moc \
-))
-
$(eval $(call gb_Library_set_componentfile,fps_kde4,fpicker/source/unx/kde4/fps_kde4))
$(eval $(call gb_Library_add_api,fps_kde4,\
@@ -61,10 +57,6 @@ $(eval $(call gb_Library_add_exception_objects,fps_kde4,\
fpicker/source/unx/kde4/KDE4FPEntry \
))
-$(eval $(call gb_Library_add_generated_cxxobjects,fps_kde4,\
- CustomTarget/fpicker/source/unx/kde4/KDE4FilePicker.moc \
-))
-
# KDE/Qt consider -Wshadow more trouble than benefit
$(eval $(call gb_Library_add_cxxflags,fps_kde4,\
-Wno-shadow \
diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk
index 0491e54..2faa777 100644
--- a/fpicker/Module_fpicker.mk
+++ b/fpicker/Module_fpicker.mk
@@ -62,7 +62,6 @@ endif
ifeq ($(ENABLE_KDE4),TRUE)
$(eval $(call gb_Module_add_targets,fpicker,\
Library_fps_kde4 \
- Package_kde4_moc \
))
endif
endif
diff --git a/fpicker/Package_kde4_moc.mk b/fpicker/Package_kde4_moc.mk
deleted file mode 100644
index 27ab13a..0000000
--- a/fpicker/Package_kde4_moc.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,fpicker_kde4_moc,$(WORKDIR)/CustomTarget/fpicker/source/unx/kde4))
-
-$(eval $(call gb_Package_add_customtarget,fpicker_kde4_moc,fpicker/source/unx/kde4))
-
-$(eval $(call gb_CustomTarget_add_dependencies,fpicker/source/unx/kde4,\
- fpicker/source/unx/kde4/KDE4FilePicker.hxx \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/fpicker/source/unx/kde4/Makefile b/fpicker/source/unx/kde4/Makefile
deleted file mode 100644
index cd0ad6e..0000000
--- a/fpicker/source/unx/kde4/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-KDE4FilePicker.moc.cxx :
- $(MOC4) -o $@ $(SRCDIR)/fpicker/source/unx/kde4/KDE4FilePicker.hxx
-
-.DEFAULT_GOAL := all
-.PHONY : all
-all : KDE4FilePicker.moc.cxx
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:
commit e569e0ad23c1b1152724a395b4c0a2b021c1521e
Author: LuboÅ¡ LuÅák <l.lunak at suse.cz>
Date: Fri Mar 16 20:27:52 2012 +0100
do not initialize a field with itself
diff --git a/dbaccess/source/ui/misc/charsets.cxx b/dbaccess/source/ui/misc/charsets.cxx
index 55f3eaa..d0789ab 100644
--- a/dbaccess/source/ui/misc/charsets.cxx
+++ b/dbaccess/source/ui/misc/charsets.cxx
@@ -111,7 +111,7 @@ namespace dbaui
//-------------------------------------------------------------------------
CharsetDisplayDerefHelper::CharsetDisplayDerefHelper(const CharsetDisplayDerefHelper& _rSource)
:CharsetDisplayDerefHelper_Base(_rSource)
- ,m_sDisplayName(m_sDisplayName)
+ ,m_sDisplayName(_rSource.m_sDisplayName)
{
}
More information about the Libreoffice-commits
mailing list