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
59d3d7e9bd

+ 1
- 1
ChangeLog View File

@@ -387,7 +387,7 @@ Version 2.5
387 387
     2.6-rc1 (Release Date: 06.04.2003):
388 388
         Added icon to service menu entry
389 389
         Fixed gcc 3.x compiler warnings
390
-        Fixed kfile plugins returning spaces at the end
390
+        Fixed tdefile plugins returning spaces at the end
391 391
         Greatly improved startup time
392 392
     2.6-rc2 (Release Date: 11.04.2003):
393 393
         History size can be configured now

+ 1
- 1
TODO View File

@@ -161,7 +161,7 @@ Of course a drop-down combo "memory" would help.
161 161
 
162 162
 I hope my "annoyance" is helpful, Phoenix
163 163
 ===================================================================
164
-[23:32:12] <Keimix> BTW  is there a possibility to load just one of the kfile-plugins at krename startup, because loading all slows krename down alot?
164
+[23:32:12] <Keimix> BTW  is there a possibility to load just one of the tdefile-plugins at krename startup, because loading all slows krename down alot?
165 165
 [23:35:49] <domseichter> No, not yet. But it's a good idea. Strange that I did not have it and nobody asked me for this feature!
166 166
 ===================================================================
167 167
 "Squashing weird characters" sollte auf die ToDO liste

+ 4
- 4
acinclude.m4 View File

@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
602 602
         fi
603 603
 
604 604
         if test -n "$trinity2ornewer"; then
605
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
605
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
606 606
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
607 607
         fi
608 608
         if test -n "$trinity3ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
1788 1788
   kde_check_lib="libtdecore.la"
1789 1789
 else
1790 1790
   kde_check_header="ksharedptr.h"
1791
-  kde_check_lib="libkio.la"
1791
+  kde_check_lib="libtdeio.la"
1792 1792
 fi
1793 1793
 
1794 1794
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
2094 2094
    AC_SUBST(LIB_KIO, "-lkio")
2095 2095
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
2096 2096
    AC_SUBST(LIB_SMB, "-lsmb")
2097
-   AC_SUBST(LIB_KFILE, "-lkfile")
2097
+   AC_SUBST(LIB_KFILE, "-ltdefile")
2098 2098
    AC_SUBST(LIB_KAB, "-lkab")
2099 2099
    AC_SUBST(LIB_KHTML, "-ltdehtml")
2100 2100
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
2104 2104
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
2105 2105
    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
2106 2106
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
2107
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
2107
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
2108 2108
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
2109 2109
 fi
2110 2110
 ])

+ 2
- 2
krename/batchrenamer.cpp View File

@@ -38,8 +38,8 @@
38 38
 
39 39
 // KDE includes
40 40
 #include <kapplication.h>
41
-#include <kio/job.h>
42
-#include <kio/netaccess.h>
41
+#include <tdeio/job.h>
42
+#include <tdeio/netaccess.h>
43 43
 #include <klocale.h>
44 44
 
45 45
 // Own includes

+ 1
- 1
krename/commandplugin.cpp View File

@@ -24,7 +24,7 @@
24 24
 
25 25
 // KDE includes
26 26
 #include <kapplication.h>
27
-#include <kconfig.h>
27
+#include <tdeconfig.h>
28 28
 #include <kiconloader.h>
29 29
 #include <klocale.h>
30 30
 #include <klineedit.h>

+ 2
- 2
krename/dateplugin.cpp View File

@@ -20,8 +20,8 @@
20 20
 #include <tqdatetime.h>
21 21
 
22 22
 // KDE includes
23
-#include <kfileitem.h>
24
-#include <kio/netaccess.h>
23
+#include <tdefileitem.h>
24
+#include <tdeio/netaccess.h>
25 25
 #include <klocale.h>
26 26
 
27 27
 DatePlugin::DatePlugin()

+ 1
- 1
krename/dsdirselectdialog.h View File

@@ -18,7 +18,7 @@
18 18
 #ifndef DSDIRSELECTDIALOG_H
19 19
 #define DSDIRSELECTDIALOG_H
20 20
 
21
-#include <kfiledialog.h>
21
+#include <tdefiledialog.h>
22 22
 
23 23
 class TQCheckBox;
24 24
 class TQLabel;

+ 2
- 2
krename/fileoperation.cpp View File

@@ -18,8 +18,8 @@
18 18
 // KDE includes
19 19
 #include <kapplication.h>
20 20
 #include <klocale.h>
21
-#include <kio/netaccess.h>
22
-#include <kio/job.h>
21
+#include <tdeio/netaccess.h>
22
+#include <tdeio/job.h>
23 23
 
24 24
 // QT includes
25 25
 #include <tqeventloop.h>

+ 1
- 1
krename/fileoperation.h View File

@@ -19,7 +19,7 @@
19 19
 #define FILEOPERATION_H
20 20
 
21 21
 #include <tqobject.h>
22
-#include <kio/jobclasses.h>
22
+#include <tdeio/jobclasses.h>
23 23
 #include <kurl.h>
24 24
 
25 25
 class TQString;

+ 1
- 1
krename/fileplugin.cpp View File

@@ -25,7 +25,7 @@
25 25
 
26 26
 // KDE includes
27 27
 #include <kapplication.h>
28
-#include <kfilemetainfo.h>
28
+#include <tdefilemetainfo.h>
29 29
 #include <klineedit.h>
30 30
 #include <klistbox.h>
31 31
 #include <klocale.h>

+ 1
- 1
krename/kmyhistorycombo.cpp View File

@@ -22,7 +22,7 @@
22 22
 #include "kmyhistorycombo.h"
23 23
 
24 24
 #include <kapplication.h>
25
-#include <kconfig.h>
25
+#include <tdeconfig.h>
26 26
 #include <klocale.h>
27 27
 
28 28
 #include <tqpopupmenu.h>

+ 2
- 2
krename/kmylistbox.cpp View File

@@ -28,8 +28,8 @@
28 28
 #include <kdirlister.h>
29 29
 #include <kiconloader.h>
30 30
 #include <klocale.h>
31
-#include <kio/previewjob.h>
32
-#include <kio/netaccess.h>
31
+#include <tdeio/previewjob.h>
32
+#include <tdeio/netaccess.h>
33 33
 #include <tqptrlist.h>
34 34
 #include <kurldrag.h>
35 35
 #include <kurllabel.h>

+ 1
- 1
krename/kmylistbox.h View File

@@ -21,7 +21,7 @@
21 21
 // KDE includes
22 22
 #include <klistbox.h>
23 23
 #include <kurl.h>
24
-#include <kfileitem.h>
24
+#include <tdefileitem.h>
25 25
 
26 26
 // TQt includes
27 27
 #include <tqmutex.h>

+ 1
- 1
krename/krecursivelister.h View File

@@ -21,7 +21,7 @@
21 21
 #include <tqwidget.h>
22 22
 #include <tqobject.h>
23 23
 #include <kdirlister.h>
24
-#include <kfileitem.h>
24
+#include <tdefileitem.h>
25 25
 #include <tqguardedptr.h>
26 26
 
27 27
 /**A convienience class that recursively lists a directory

+ 3
- 3
krename/krenameimpl.cpp View File

@@ -43,8 +43,8 @@
43 43
 #include <kaction.h>
44 44
 #include <kcmdlineargs.h>
45 45
 #include <kdirselectdialog.h>
46
-#include <kfiledialog.h>
47
-#include <kfileitem.h>
46
+#include <tdefiledialog.h>
47
+#include <tdefileitem.h>
48 48
 #include <khelpmenu.h>
49 49
 #include <kiconloader.h>
50 50
 #include <kmessagebox.h>
@@ -53,7 +53,7 @@
53 53
 #include <kurlrequester.h>
54 54
 #include <ktempfile.h> 
55 55
 #include <klocale.h>
56
-#include <kio/netaccess.h>
56
+#include <tdeio/netaccess.h>
57 57
 
58 58
 // QT includes
59 59
 #include <tqbuttongroup.h>

+ 1
- 1
krename/main.cpp View File

@@ -23,7 +23,7 @@
23 23
 #include <kapplication.h>
24 24
 #include <kaboutapplication.h>
25 25
 #include <kcmdlineargs.h>
26
-#include <kconfig.h>
26
+#include <tdeconfig.h>
27 27
 #include <kimageio.h>
28 28
 #include <klocale.h>
29 29
 #include <kmessagebox.h>

+ 1
- 1
krename/mydirplugin.cpp View File

@@ -21,7 +21,7 @@
21 21
 // KDE includes
22 22
 #include <kapplication.h>
23 23
 #include <kiconloader.h>
24
-#include <kfiledialog.h>
24
+#include <tdefiledialog.h>
25 25
 #include <klocale.h>
26 26
 
27 27
 // QT includes

+ 1
- 1
krename/numberdialog.cpp View File

@@ -25,7 +25,7 @@
25 25
 
26 26
 // KDE includes
27 27
 #include <kapplication.h>
28
-#include <kconfig.h>
28
+#include <tdeconfig.h>
29 29
 #include <klocale.h>
30 30
 #include <kpushbutton.h>
31 31
 #include <tqcheckbox.h>

+ 4
- 4
krename/pluginloader.cpp View File

@@ -166,12 +166,12 @@ void PluginLoader::loadFilePlugins()
166 166
     for( unsigned int i = 0; i < list.count(); i++ ) {
167 167
         KService* s = (KService*)list[i];
168 168
         if( !s->terminal() && s->type() == "Service" && s->hasServiceType( "KFilePlugin" ) ) {
169
-            FilePlugin* kfileplugin = new FilePlugin( s );
170
-            if( kfileplugin->isValid() ) {
171
-                addPlugin( kfileplugin );
169
+            FilePlugin* tdefileplugin = new FilePlugin( s );
170
+            if( tdefileplugin->isValid() ) {
171
+                addPlugin( tdefileplugin );
172 172
                 kapp->processEvents();
173 173
             } else
174
-                delete kfileplugin;
174
+                delete tdefileplugin;
175 175
         }
176 176
     }
177 177
     

+ 1
- 1
krename/profiledlg.cpp View File

@@ -23,7 +23,7 @@
23 23
 
24 24
 #include <kapplication.h>
25 25
 #include <kcombobox.h>
26
-#include <kconfig.h>
26
+#include <tdeconfig.h>
27 27
 #include <kiconloader.h>
28 28
 #include <kinputdialog.h> 
29 29
 #include <klistbox.h>

+ 1
- 1
krename/replacedialog.cpp View File

@@ -27,7 +27,7 @@
27 27
 
28 28
 // KDE includes
29 29
 #include <kapplication.h>
30
-#include <kconfig.h>
30
+#include <tdeconfig.h>
31 31
 #include <klocale.h>
32 32
 #include <klistview.h>
33 33
 #include <kmessagebox.h>

+ 1
- 1
krename/semantic.cache
File diff suppressed because it is too large
View File


+ 1
- 1
krename/threadedlister.h View File

@@ -22,7 +22,7 @@
22 22
 #include <tqobject.h>
23 23
 #include <tqthread.h>
24 24
 
25
-#include <kfileitem.h>
25
+#include <tdefileitem.h>
26 26
 
27 27
 class KDirLister;
28 28
 class KRecursiveLister;

+ 1
- 1
krename/undodialog.cpp View File

@@ -22,7 +22,7 @@
22 22
 #include <tqlayout.h>
23 23
 
24 24
 // KDE includes
25
-#include <kfiledialog.h>
25
+#include <tdefiledialog.h>
26 26
 #include <klocale.h>
27 27
 #include <kmessagebox.h>
28 28
 #include <kprocess.h>

Loading…
Cancel
Save