Browse Source

Rename a number of libraries and executables to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
5ff32d08eb
4 changed files with 7 additions and 7 deletions
  1. 1
    1
      kdialogd3/CMakeLists.txt
  2. 2
    2
      kdialogd3/kdialogd.cpp
  3. 3
    3
      kdialogd3/kdialogd.h
  4. 1
    1
      kgtk-wrapper

+ 1
- 1
kdialogd3/CMakeLists.txt View File

@@ -35,6 +35,6 @@ set( ${target}_SRCS
35 35
 
36 36
 tde_add_executable( ${target} AUTOMOC
37 37
   SOURCES ${${target}_SRCS}
38
-  LINK tdecore-shared tdeui-shared kio-shared
38
+  LINK tdecore-shared tdeui-shared tdeio-shared
39 39
   DESTINATION ${BIN_INSTALL_DIR}
40 40
 )

+ 2
- 2
kdialogd3/kdialogd.cpp View File

@@ -5,10 +5,10 @@
5 5
 #include <kdiroperator.h>
6 6
 #include <kuniqueapplication.h>
7 7
 #include <tqsocketnotifier.h>
8
-#include <kio/netaccess.h>
8
+#include <tdeio/netaccess.h>
9 9
 #include <kmessagebox.h>
10 10
 #include <klocale.h>
11
-#include <kconfig.h>
11
+#include <tdeconfig.h>
12 12
 #include <kurlcombobox.h>
13 13
 #ifdef USE_KWIN
14 14
 #include <twin.h>

+ 3
- 3
kdialogd3/kdialogd.h View File

@@ -1,9 +1,9 @@
1 1
 #ifndef __KDIALOGD_H__
2 2
 #define __KDIALOGD_H__
3 3
 
4
-#include <kfile.h>
5
-#include <kfiledialog.h>
6
-#include <kfiledialog.h>
4
+#include <tdefile.h>
5
+#include <tdefiledialog.h>
6
+#include <tdefiledialog.h>
7 7
 #include <kdirselectdialog.h>
8 8
 #include "common.h"
9 9
 #include "config.h"

+ 1
- 1
kgtk-wrapper View File

@@ -72,7 +72,7 @@ if [ "$toolkit" = "" ] && [ ! -z "$realApp" ] ; then
72 72
         fi
73 73
 
74 74
         if [ "$toolkit" = "qt3" ] || [ "$toolkit" = "qt4" ] ; then
75
-            if [ "0" != "`echo $libs | grep libkio | wc -l`" ] ; then
75
+            if [ "0" != "`echo $libs | grep libtdeio | wc -l`" ] ; then
76 76
                 toolkit=""
77 77
             fi
78 78
         fi

Loading…
Cancel
Save