rpms/kdebase-workspace/devel kdebase-workspace-4.4.2-qt47.patch, 1.2, 1.3

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1062

Modified Files:
	kdebase-workspace-4.4.2-qt47.patch 
Log Message:
respin qt47 patch


kdebase-workspace-4.4.2-qt47.patch:
 plasma/generic/applets/battery/battery.cpp     |    1 -
 plasma/generic/applets/digital-clock/clock.cpp |    1 -
 solid/networkmanager-0.7/accesspoint.cpp       |    2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

Index: kdebase-workspace-4.4.2-qt47.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace-4.4.2-qt47.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kdebase-workspace-4.4.2-qt47.patch	1 Apr 2010 14:17:51 -0000	1.2
+++ kdebase-workspace-4.4.2-qt47.patch	1 Apr 2010 14:58:24 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up kdebase-workspace-4.4.2/plasma/generic/applets/battery/battery.cpp.qt47 kdebase-workspace-4.4.2/plasma/generic/applets/battery/battery.cpp
---- kdebase-workspace-4.4.2/plasma/generic/applets/battery/battery.cpp.qt47	2010-04-01 09:13:26.645603835 -0500
-+++ kdebase-workspace-4.4.2/plasma/generic/applets/battery/battery.cpp	2010-04-01 09:18:25.676340891 -0500
+--- kdebase-workspace-4.4.2/plasma/generic/applets/battery/battery.cpp.qt47	2010-04-01 09:57:43.408591788 -0500
++++ kdebase-workspace-4.4.2/plasma/generic/applets/battery/battery.cpp	2010-04-01 09:57:43.415591144 -0500
 @@ -84,7 +84,6 @@ Battery::Battery(QObject *parent, const 
        m_hours(0),
        m_theme(0),
@@ -9,9 +9,20 @@ diff -up kdebase-workspace-4.4.2/plasma/
        m_numOfBattery(0),
        m_acAdapterPlugged(false),
        m_remainingMSecs(0),
+diff -up kdebase-workspace-4.4.2/plasma/generic/applets/digital-clock/clock.cpp.qt47 kdebase-workspace-4.4.2/plasma/generic/applets/digital-clock/clock.cpp
+--- kdebase-workspace-4.4.2/plasma/generic/applets/digital-clock/clock.cpp.qt47	2010-02-26 12:31:57.000000000 -0600
++++ kdebase-workspace-4.4.2/plasma/generic/applets/digital-clock/clock.cpp	2010-04-01 09:58:23.726354288 -0500
+@@ -54,7 +54,6 @@ Clock::Clock(QObject *parent, const QVar
+       m_showSeconds(false),
+       m_showTimezone(false),
+       m_dateTimezoneBesides(false),
+-      m_dateString(0),
+       m_layout(0)
+ {
+     KGlobal::locale()->insertCatalog("libplasmaclock");
 diff -up kdebase-workspace-4.4.2/solid/networkmanager-0.7/accesspoint.cpp.qt47 kdebase-workspace-4.4.2/solid/networkmanager-0.7/accesspoint.cpp
 --- kdebase-workspace-4.4.2/solid/networkmanager-0.7/accesspoint.cpp.qt47	2009-08-12 04:59:33.000000000 -0500
-+++ kdebase-workspace-4.4.2/solid/networkmanager-0.7/accesspoint.cpp	2010-04-01 09:13:26.649590935 -0500
++++ kdebase-workspace-4.4.2/solid/networkmanager-0.7/accesspoint.cpp	2010-04-01 09:57:43.415591144 -0500
 @@ -29,7 +29,7 @@ along with this program.  If not, see <h
  class NMAccessPoint::Private
  {