From ea14bd1fba4d54f50055acb4b2755de949eb24f7 Mon Sep 17 00:00:00 2001
From: sylvain <sylvain@sylvain-MacBookPro.(none)>
Date: Sun, 13 Oct 2013 14:31:54 +0200
Subject: [PATCH] rename protocols to protocol

---
 rdpy/display/qt/adaptor.py | 2 +-
 rdpy/main.py               | 6 +++---
 rdpy/protocol/rdp/tpdu.py  | 4 ++--
 rdpy/protocol/rdp/tpkt.py  | 6 +++---
 rdpy/protocol/rfb/rfb.py   | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/rdpy/display/qt/adaptor.py b/rdpy/display/qt/adaptor.py
index e4952a8..0a2d6b2 100644
--- a/rdpy/display/qt/adaptor.py
+++ b/rdpy/display/qt/adaptor.py
@@ -3,7 +3,7 @@ Created on 4 sept. 2013
 @author: sylvain
 '''
 from PyQt4 import QtGui
-from rdpy.protocols.rfb.observer import RfbObserver
+from rdpy.protocol.rfb.observer import RfbObserver
 
 class QAdaptor(object):
     '''
diff --git a/rdpy/main.py b/rdpy/main.py
index 0b58266..c49c49e 100644
--- a/rdpy/main.py
+++ b/rdpy/main.py
@@ -5,9 +5,9 @@ Created on 4 sept. 2013
 '''
 import sys
 from PyQt4 import QtGui
-from rdpy.ui.qt import adaptor, widget
-from rdpy.protocols.rfb import rfb, factory
-from rdpy.protocols.rdp import tpkt, tpdu
+from rdpy.display.qt import adaptor, widget
+from rdpy.protocol.rfb import rfb, factory
+from rdpy.protocol.rdp import tpkt, tpdu
 from twisted.internet import ssl
 from OpenSSL import SSL
 
diff --git a/rdpy/protocol/rdp/tpdu.py b/rdpy/protocol/rdp/tpdu.py
index 414dc04..f7a99b1 100644
--- a/rdpy/protocol/rdp/tpdu.py
+++ b/rdpy/protocol/rdp/tpdu.py
@@ -3,8 +3,8 @@ Created on 5 sept. 2013
 
 @author: sylvain
 '''
-from rdpy.protocols.common.layer import Layer
-from rdpy.protocols.common.stream import Stream
+from rdpy.protocol.common.layer import Layer
+from rdpy.protocol.common.stream import Stream
 class TPDU(Layer):
     '''
     classdocs
diff --git a/rdpy/protocol/rdp/tpkt.py b/rdpy/protocol/rdp/tpkt.py
index b164c8e..7d72fb9 100644
--- a/rdpy/protocol/rdp/tpkt.py
+++ b/rdpy/protocol/rdp/tpkt.py
@@ -4,9 +4,9 @@ Created on 5 sept. 2013
 @author: sylvain
 '''
 
-from rdpy.protocols.common.protocolbuffer import ProtocolBuffer
-from rdpy.protocols.common.layer import Layer
-from rdpy.protocols.common.stream import Stream
+from rdpy.protocol.common.protocolbuffer import ProtocolBuffer
+from rdpy.protocol.common.layer import Layer
+from rdpy.protocol.common.stream import Stream
 class TPKT(ProtocolBuffer, Layer):
     '''
     classdocs
diff --git a/rdpy/protocol/rfb/rfb.py b/rdpy/protocol/rfb/rfb.py
index 71fdffc..1dc72ce 100644
--- a/rdpy/protocol/rfb/rfb.py
+++ b/rdpy/protocol/rfb/rfb.py
@@ -4,8 +4,8 @@ Created on 12 aout 2013
 @author: sylvain
 '''
 
-from rdpy.protocols.common.stream import Stream
-from rdpy.protocols.common.protocolbuffer import ProtocolBuffer
+from rdpy.protocol.common.stream import Stream
+from rdpy.protocol.common.protocolbuffer import ProtocolBuffer
 from types import PixelFormat,ProtocolVersion,SecurityType, Rectangle, Encoding
 
 class Rfb(ProtocolBuffer):