From 5ea73b5ab9b92c2e3a1a658122697b95842b6be5 Mon Sep 17 00:00:00 2001
From: Jussi Kinnula <ext-jussi.1.kinnula@nokia.com>
Date: Wed, 27 Oct 2010 12:08:09 +0300
Subject: Fixed a typo in client.cpp, VideoRegording->VideoRecording

---
 resourceqt-client/client.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resourceqt-client/client.cpp b/resourceqt-client/client.cpp
index 1b92d67..25ae5a1 100644
--- a/resourceqt-client/client.cpp
+++ b/resourceqt-client/client.cpp
@@ -155,7 +155,7 @@ const char * resourceTypeToString(ResourceType type)
     case VideoPlaybackType:
         return "VideoPlayback";
     case VideoRecorderType:
-        return "VideoRegording";
+        return "VideoRecording";
     case VibraType:
         return "Vibra";
     case LedsType:
-- 
cgit v1.2.3


From 73fd8fbacad4d909b64fa8507959b278542316f3 Mon Sep 17 00:00:00 2001
From: Wolf Bergenheim <ext-wolf.2.bergenheim@nokia.com>
Date: Wed, 27 Oct 2010 08:36:40 +0300
Subject: Using Q_SLOTS instead of slots as per NB#200078

---
 libdbus-qeventloop/dbusconnectioneventloop.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libdbus-qeventloop/dbusconnectioneventloop.h b/libdbus-qeventloop/dbusconnectioneventloop.h
index 626bffb..c95c314 100644
--- a/libdbus-qeventloop/dbusconnectioneventloop.h
+++ b/libdbus-qeventloop/dbusconnectioneventloop.h
@@ -124,7 +124,7 @@ private:
      */
     Connections	connections;
 
-private slots:
+private Q_SLOTS:
     void readSocket(int fd);
     void writeSocket(int fd);
     void dispatch();
-- 
cgit v1.2.3