From 744781a03d51eb8d2d7f79c583ddf7fd0f0b9595 Mon Sep 17 00:00:00 2001
From: Nathan Osman <admin@quickmediasolutions.com>
Date: Thu, 1 Aug 2013 17:55:32 -0700
Subject: [PATCH] Added Lexer class to QRedis namespace.

---
 src/lexer.cpp |  2 ++
 src/lexer.h   | 63 +++++++++++++++++++++++++++------------------------
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/src/lexer.cpp b/src/lexer.cpp
index 4fbe2fc..baa975a 100644
--- a/src/lexer.cpp
+++ b/src/lexer.cpp
@@ -1,5 +1,7 @@
 #include "lexer.h"
 
+using namespace QRedis;
+
 Lexer::Lexer(QIODevice * device, QObject * parent)
     : QObject(parent), device(device), state(DoingNothing), crlf(0)
 {
diff --git a/src/lexer.h b/src/lexer.h
index d4d7be3..1d3df60 100644
--- a/src/lexer.h
+++ b/src/lexer.h
@@ -1,47 +1,50 @@
-#ifndef LEXER_H
-#define LEXER_H
+#ifndef QREDIS_LEXER_H
+#define QREDIS_LEXER_H
 
 #include <QIODevice>
 #include <QObject>
 
-class Lexer : public QObject
+namespace QRedis
 {
-    Q_OBJECT
+    class Lexer : public QObject
+    {
+        Q_OBJECT
 
-    public:
+        public:
 
-        Lexer(QIODevice *, QObject * = 0);
-        virtual ~Lexer();
+            Lexer(QIODevice *, QObject * = 0);
+            virtual ~Lexer();
 
-    Q_SIGNALS:
+        Q_SIGNALS:
 
-        void character(char);
-        void unsafeString(const QString &);
-        void safeString(const QByteArray &);
+            void character(char);
+            void unsafeString(const QString &);
+            void safeString(const QByteArray &);
 
-    private Q_SLOTS:
+        private Q_SLOTS:
 
-        void readData();
+            void readData();
 
-    private:
+        private:
 
-        bool readCharacter();
-        bool readLength();
-        bool readUnsafeString();
-        bool readSafeString();
+            bool readCharacter();
+            bool readLength();
+            bool readUnsafeString();
+            bool readSafeString();
 
-        QIODevice * device;
-        QByteArray buffer;
+            QIODevice * device;
+            QByteArray buffer;
 
-        enum {
-            DoingNothing,
-            ReadingLength,
-            ReadingUnsafeString,
-            ReadingSafeString
-        } state;
+            enum {
+                DoingNothing,
+                ReadingLength,
+                ReadingUnsafeString,
+                ReadingSafeString
+            } state;
 
-        int crlf;
-        int length;
-};
+            int crlf;
+            int length;
+    };
+}
 
-#endif // LEXER_H
+#endif // QREDIS_LEXER_H