Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4

7 files changed, 10 insertions, 10 deletions

diff --git a/khexedit/lib/controller/kchareditor.cpp b/khexedit/lib/controller/kchareditor.cpp
index 9f58245..a401651 100644
--- a/khexedit/lib/controller/kchareditor.cpp
+++ b/khexedit/lib/controller/kchareditor.cpp
@@ -27,7 +27,7 @@
 using namespace KHE;
 
 
-KCharEditor::KCharEditor( KCharColumn *CC, KBufferCursor *BC, KHexEdit *HE, KController *P )
+KCharEditor::KCharEditor( KCharColumn *CC, TDEBufferCursor *BC, KHexEdit *HE, KController *P )
   : KEditor( BC, HE, P ),
   CharColumn( CC )
 {
diff --git a/khexedit/lib/controller/kchareditor.h b/khexedit/lib/controller/kchareditor.h
index fba1f66..e15d616 100644
--- a/khexedit/lib/controller/kchareditor.h
+++ b/khexedit/lib/controller/kchareditor.h
@@ -29,7 +29,7 @@ class KCharColumn;
 class KCharEditor : public KEditor
 {
   public:
-    KCharEditor( KCharColumn *CC, KBufferCursor *BC, KHexEdit *HE, KController *P );
+    KCharEditor( KCharColumn *CC, TDEBufferCursor *BC, KHexEdit *HE, KController *P );
 
   public: // KEditor API
     virtual bool handleKeyPress( TQKeyEvent *KeyEvent );
diff --git a/khexedit/lib/controller/keditor.cpp b/khexedit/lib/controller/keditor.cpp
index 513f41d..b99f099 100644
--- a/khexedit/lib/controller/keditor.cpp
+++ b/khexedit/lib/controller/keditor.cpp
@@ -28,7 +28,7 @@
 
 using namespace KHE;
 
-KEditor::KEditor( KBufferCursor *BC, KHexEdit* HE, KController *P )
+KEditor::KEditor( TDEBufferCursor *BC, KHexEdit* HE, KController *P )
   : KController( HE, P ),
   BufferCursor( BC )
 {
diff --git a/khexedit/lib/controller/keditor.h b/khexedit/lib/controller/keditor.h
index e4fa06c..6621cb4 100644
--- a/khexedit/lib/controller/keditor.h
+++ b/khexedit/lib/controller/keditor.h
@@ -26,7 +26,7 @@
 namespace KHE
 {
 
-class KBufferCursor;
+class TDEBufferCursor;
 
 class KEditor : public KController
 {
@@ -34,7 +34,7 @@ class KEditor : public KController
     enum KEditAction { CharDelete, WordDelete, CharBackspace, WordBackspace };
 
   protected:
-    KEditor( KBufferCursor *BC, KHexEdit *HE, KController *P );
+    KEditor( TDEBufferCursor *BC, KHexEdit *HE, KController *P );
 
   public: // API
     virtual bool handleKeyPress( TQKeyEvent *KeyEvent );
@@ -44,7 +44,7 @@ class KEditor : public KController
     void doEditAction( KEditAction Action );
 
   protected:
-    KBufferCursor *BufferCursor;
+    TDEBufferCursor *BufferCursor;
 };
 
 }
diff --git a/khexedit/lib/controller/knavigator.cpp b/khexedit/lib/controller/knavigator.cpp
index 156068e..9ae06c9 100644
--- a/khexedit/lib/controller/knavigator.cpp
+++ b/khexedit/lib/controller/knavigator.cpp
@@ -86,8 +86,8 @@ void KNavigator::moveCursor( KMoveAction Action, bool Select )
 {
   HexEdit->pauseCursor( true );
 
-  KBufferCursor *BufferCursor = HexEdit->BufferCursor;
-  KBufferRanges *BufferRanges = HexEdit->BufferRanges;
+  TDEBufferCursor *BufferCursor = HexEdit->BufferCursor;
+  TDEBufferRanges *BufferRanges = HexEdit->BufferRanges;
 
   if( Select )
   {
diff --git a/khexedit/lib/controller/kvalueeditor.cpp b/khexedit/lib/controller/kvalueeditor.cpp
index 70b9c41..822ccaa 100644
--- a/khexedit/lib/controller/kvalueeditor.cpp
+++ b/khexedit/lib/controller/kvalueeditor.cpp
@@ -27,7 +27,7 @@
 
 using namespace KHE;
 
-KValueEditor::KValueEditor( KValueColumn *VC, KBufferCursor *BC, KHexEdit* HE, KController *P )
+KValueEditor::KValueEditor( KValueColumn *VC, TDEBufferCursor *BC, KHexEdit* HE, KController *P )
   : KEditor( BC, HE, P ),
   ValueColumn( VC ),
   InEditMode( false ),
diff --git a/khexedit/lib/controller/kvalueeditor.h b/khexedit/lib/controller/kvalueeditor.h
index 4656c36..7fb1292 100644
--- a/khexedit/lib/controller/kvalueeditor.h
+++ b/khexedit/lib/controller/kvalueeditor.h
@@ -35,7 +35,7 @@ class KValueEditor: public KEditor
     { EnterValue, IncValue, DecValue, ValueAppend, ValueEdit, LeaveValue, CancelValue, ValueBackspace };
 
   public:
-    KValueEditor( KValueColumn *VC, KBufferCursor *BC, KHexEdit *HE, KController *P );
+    KValueEditor( KValueColumn *VC, TDEBufferCursor *BC, KHexEdit *HE, KController *P );
     virtual ~KValueEditor();
 
   public: // KEditor API