Browse Source

Additional k => tde renaming and fixes

Slávek Banko 5 years ago
parent
commit
2ac88a7a3c

+ 1
- 1
TODO View File

@@ -43,7 +43,7 @@ for 0.10.x:
43 43
   ...
44 44
 
45 45
 Deferred:
46
-- Introduce a smb4k:/ kio slave?
46
+- Introduce a smb4k:/ tdeio slave?
47 47
 - Support SELinux.
48 48
 - Make it configurable if the workgroup master browser should be queried
49 49
   to retrieve the comment etc. for a host or not when using the IP scan

+ 12
- 12
acinclude.m4 View File

@@ -2070,35 +2070,35 @@ if test $kde_qtver = 3; then
2070 2070
    AC_SUBST(LIB_KDED, $lib_kded)
2071 2071
    AC_SUBST(LIB_TDECORE, "-ltdecore")
2072 2072
    AC_SUBST(LIB_TDEUI, "-ltdeui")
2073
-   AC_SUBST(LIB_KIO, "-ltdeio")
2073
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
2074 2074
    AC_SUBST(LIB_KJS, "-lkjs")
2075 2075
    AC_SUBST(LIB_SMB, "-lsmb")
2076 2076
    AC_SUBST(LIB_KAB, "-lkab")
2077 2077
    AC_SUBST(LIB_TDEABC, "-ltdeabc")
2078 2078
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
2079
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
2080
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
2079
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
2080
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
2081 2081
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2082
-   AC_SUBST(LIB_KUTILS, "-ltdeutils")
2082
+   AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
2083 2083
    AC_SUBST(LIB_TDEPIM, "-ltdepim")
2084
-   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
2084
+   AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
2085 2085
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
2086
-   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
2087
-   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
2086
+   AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
2087
+   AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
2088 2088
 # these are for backward compatibility
2089
-   AC_SUBST(LIB_KSYCOCA, "-ltdeio")
2089
+   AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
2090 2090
    AC_SUBST(LIB_TDEFILE, "-ltdeio")
2091 2091
 elif test $kde_qtver = 2; then
2092 2092
    AC_SUBST(LIB_TDECORE, "-ltdecore")
2093 2093
    AC_SUBST(LIB_TDEUI, "-ltdeui")
2094
-   AC_SUBST(LIB_KIO, "-ltdeio")
2095
-   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
2094
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
2095
+   AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
2096 2096
    AC_SUBST(LIB_SMB, "-lsmb")
2097 2097
    AC_SUBST(LIB_TDEFILE, "-ltdefile")
2098 2098
    AC_SUBST(LIB_KAB, "-lkab")
2099 2099
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
2100
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
2101
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
2100
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
2101
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
2102 2102
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2103 2103
 else
2104 2104
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")

+ 1
- 1
plugin/Makefile.am View File

@@ -5,7 +5,7 @@ konqsidebar_smb4k_la_SOURCES = smb4k_konqplugin.cpp
5 5
 konqsidebar_smb4k_la_LDFLAGS = -module $(all_libraries) \
6 6
 	-L$(top_builddir)/smb4k/core -L$(topbuild_dir)/smb4k/widgets -lkonqsidebarplugin
7 7
 konqsidebar_smb4k_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
8
-	$(KDE_PLUGIN) $(LIB_TDEFILE) $(LIB_KPARTS) $(LIB_QT) $(LIB_TDECORE) \
8
+	$(KDE_PLUGIN) $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_QT) $(LIB_TDECORE) \
9 9
 	$(LIB_TDEUI)
10 10
 
11 11
 globaladddir   = $(kde_datadir)/konqsidebartng/add

+ 2
- 2
po/de.po View File

@@ -1355,11 +1355,11 @@ msgstr "Smb4KNetworkBrowserPart"
1355 1355
 
1356 1356
 #: smb4k/core/smb4kcore.cpp:248
1357 1357
 msgid ""
1358
-"Up to KDE 3.3.x, KIO and Konqueror cannot handle CIFS shares. Konqueror will "
1358
+"Up to KDE 3.3.x, TDEIO and Konqueror cannot handle CIFS shares. Konqueror will "
1359 1359
 "hang if you try to access it.\n"
1360 1360
 "Do you want to continue?"
1361 1361
 msgstr ""
1362
-"Bis einschließlich KDE 3.3.x können KIO und Konqueror CIFS-Freigaben nicht "
1362
+"Bis einschließlich KDE 3.3.x können TDEIO und Konqueror CIFS-Freigaben nicht "
1363 1363
 "handhaben. Konqueror wird sich aufhängen, falls Sie versuchen, auf die "
1364 1364
 "Freigaben zuzugreifen.\n"
1365 1365
 "Wollen Sie fortfahren?"

+ 2
- 2
po/es.po View File

@@ -1342,11 +1342,11 @@ msgstr "Smb4KNetworkBrowserPart"
1342 1342
 
1343 1343
 #: smb4k/core/smb4kcore.cpp:248
1344 1344
 msgid ""
1345
-"Up to KDE 3.3.x, KIO and Konqueror cannot handle CIFS shares. Konqueror will "
1345
+"Up to KDE 3.3.x, TDEIO and Konqueror cannot handle CIFS shares. Konqueror will "
1346 1346
 "hang if you try to access it.\n"
1347 1347
 "Do you want to continue?"
1348 1348
 msgstr ""
1349
-"Hasta KDE 3.3.x, KIO y Konqueror no pueden manejar recursos compartidos "
1349
+"Hasta KDE 3.3.x, TDEIO y Konqueror no pueden manejar recursos compartidos "
1350 1350
 "CIFS. Konqueror fallará si intenta acceder a uno.\n"
1351 1351
 "¿Desea continuar?"
1352 1352
 

+ 2
- 2
po/it.po View File

@@ -1374,11 +1374,11 @@ msgstr "Browser di rete"
1374 1374
 
1375 1375
 #: smb4k/core/smb4kcore.cpp:248
1376 1376
 msgid ""
1377
-"Up to KDE 3.3.x, KIO and Konqueror cannot handle CIFS shares. Konqueror will "
1377
+"Up to KDE 3.3.x, TDEIO and Konqueror cannot handle CIFS shares. Konqueror will "
1378 1378
 "hang if you try to access it.\n"
1379 1379
 "Do you want to continue?"
1380 1380
 msgstr ""
1381
-"Fino alla versione 3.3.x di KDE, KIO e Konqueror non supportano le "
1381
+"Fino alla versione 3.3.x di KDE, TDEIO e Konqueror non supportano le "
1382 1382
 "condivisioni CIFS. Konqueror andrà in blocco se si tenta di accedere ad una "
1383 1383
 "di esse.\n"
1384 1384
 "Si desidera continuare?"

+ 2
- 2
po/ja.po View File

@@ -1349,11 +1349,11 @@ msgstr "Smb4KNetworkBrowserPart"
1349 1349
 
1350 1350
 #: smb4k/core/smb4kcore.cpp:248
1351 1351
 msgid ""
1352
-"Up to KDE 3.3.x, KIO and Konqueror cannot handle CIFS shares. Konqueror will "
1352
+"Up to KDE 3.3.x, TDEIO and Konqueror cannot handle CIFS shares. Konqueror will "
1353 1353
 "hang if you try to access it.\n"
1354 1354
 "Do you want to continue?"
1355 1355
 msgstr ""
1356
-"KDE 3.3.x にバージョンアップしてください。 KIO と Konquerorは、CIFS 共有を扱"
1356
+"KDE 3.3.x にバージョンアップしてください。 TDEIO と Konquerorは、CIFS 共有を扱"
1357 1357
 "うことができません。あなたが、CIFS にアクセスしようとすれば、konqueror は、ハ"
1358 1358
 "ングするでしょう。\n"
1359 1359
 "それでも、あなたは、続行しますか?"

+ 2
- 2
po/sv.po View File

@@ -3604,11 +3604,11 @@ msgstr ""
3604 3604
 #: smb4k/core/smb4kcore.cpp:248
3605 3605
 #, fuzzy
3606 3606
 msgid ""
3607
-"Up to KDE 3.3.x, KIO and Konqueror cannot handle CIFS shares. Konqueror will "
3607
+"Up to KDE 3.3.x, TDEIO and Konqueror cannot handle CIFS shares. Konqueror will "
3608 3608
 "hang if you try to access it.\n"
3609 3609
 "Do you want to continue?"
3610 3610
 msgstr ""
3611
-"Minst till version 3.3.2 från KDE och KIO. Det är inte mögligt att hantera "
3611
+"Minst till version 3.3.2 från KDE och TDEIO. Det är inte mögligt att hantera "
3612 3612
 "CIFS-Kataloger. Konqueror misslyckades, om du använder det.\n"
3613 3613
 " Vill du fortsätter?"
3614 3614
 

+ 2
- 2
po/uk.po View File

@@ -1395,11 +1395,11 @@ msgstr "Smb4KNetworkBrowserPart"
1395 1395
 
1396 1396
 #: smb4k/core/smb4kcore.cpp:248
1397 1397
 msgid ""
1398
-"Up to KDE 3.3.x, KIO and Konqueror cannot handle CIFS shares. Konqueror will "
1398
+"Up to KDE 3.3.x, TDEIO and Konqueror cannot handle CIFS shares. Konqueror will "
1399 1399
 "hang if you try to access it.\n"
1400 1400
 "Do you want to continue?"
1401 1401
 msgstr ""
1402
-"До версії KDE 3.3.x, KIO і Konqueror не можуть працювати зі спільними "
1402
+"До версії KDE 3.3.x, TDEIO і Konqueror не можуть працювати зі спільними "
1403 1403
 "ресурсами CIFS. Konqueror зависає при спробі доступу до них.\n"
1404 1404
 "Хочете продовжити?"
1405 1405
 

+ 2
- 2
smb4k/Makefile.am View File

@@ -8,8 +8,8 @@ bin_PROGRAMS = smb4k
8 8
 
9 9
 smb4k_SOURCES = main.cpp smb4k.cpp smb4ksystemtray.cpp
10 10
 smb4k_LDADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
11
-	$(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIB_KPARTS) $(LIB_QT)
12
-smb4k_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
11
+	$(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_QT)
12
+smb4k_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
13 13
 
14 14
 
15 15
 KDE_ICON = smb4k

+ 1
- 1
smb4k/browser/Makefile.am View File

@@ -8,7 +8,7 @@ libsmb4knetworkbrowser_la_SOURCES = smb4knetworkbrowser_part.cpp \
8 8
 		smb4knetworkbrowsertooltip.cpp
9 9
 libsmb4knetworkbrowser_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
10 10
 	$(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDECORE) \
11
-	$(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_KPARTS) $(LIB_QT)
11
+	$(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_QT)
12 12
 libsmb4knetworkbrowser_la_LDFLAGS = -module -no-undefined $(all_libraries)
13 13
 
14 14
 partrcdir = $(kde_datadir)/smb4knetworkbrowserpart

+ 2
- 2
smb4k/configdlg/smb4tdeconfigdialog.h View File

@@ -23,8 +23,8 @@
23 23
  *   MA  02110-1301 USA                                                    *
24 24
  ***************************************************************************/
25 25
 
26
-#ifndef SMB4KCONFIGDIALOG_H
27
-#define SMB4KCONFIGDIALOG_H
26
+#ifndef SMB4TDECONFIGDIALOG_H
27
+#define SMB4TDECONFIGDIALOG_H
28 28
 
29 29
 #ifdef HAVE_CONFIG_H
30 30
 #include <config.h>

+ 2
- 2
smb4k/configdlg/smb4tdersyncoptions.h View File

@@ -23,8 +23,8 @@
23 23
  *   MA  02110-1301 USA                                                    *
24 24
  ***************************************************************************/
25 25
 
26
-#ifndef SMB4KRSYNCOPTIONS_H
27
-#define SMB4KRSYNCOPTIONS_H
26
+#ifndef SMB4TDERSYNCOPTIONS_H
27
+#define SMB4TDERSYNCOPTIONS_H
28 28
 
29 29
 #ifdef HAVE_CONFIG_H
30 30
 #include <config.h>

+ 1
- 1
smb4k/core/Makefile.am View File

@@ -18,7 +18,7 @@ libsmb4kcore_la_SOURCES = smb4kauthinfo.cpp smb4kbookmark.cpp \
18 18
 	smb4kprint.cpp smb4kprintinfo.cpp smb4ksambaoptionshandler.cpp \
19 19
 	smb4ksambaoptionsinfo.cpp smb4kscanner.cpp smb4kscanner_p.cpp smb4ksettings.kcfgc smb4kshare.cpp \
20 20
 	smb4ksynchronizationinfo.cpp smb4ksynchronizer.cpp
21
-libsmb4kcore_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_QT)
21
+libsmb4kcore_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_QT)
22 22
 
23 23
 kde_kcfg_DATA = smb4k.kcfg
24 24
 

+ 1
- 1
smb4k/core/smb4kcore.cpp View File

@@ -245,7 +245,7 @@ void Smb4KCore::open( Smb4KShare *share, int openWith )
245 245
 
246 246
   if ( TQString::compare( share->filesystem(), "cifs" ) == 0 )
247 247
   {
248
-    if( KMessageBox::warningContinueCancel( (TQWidget *)this, i18n( "Up to KDE 3.3.x, KIO and Konqueror cannot handle CIFS shares. Konqueror will hang if you try to access it.\nDo you want to continue?" ) ) == KMessageBox::Cancel )
248
+    if( KMessageBox::warningContinueCancel( (TQWidget *)this, i18n( "Up to KDE 3.3.x, TDEIO and Konqueror cannot handle CIFS shares. Konqueror will hang if you try to access it.\nDo you want to continue?" ) ) == KMessageBox::Cancel )
249 249
     {
250 250
       return;
251 251
     }

+ 2
- 2
smb4k/core/smb4tdeglobal.h View File

@@ -23,8 +23,8 @@
23 23
  *   MA  02110-1301 USA                                                    *
24 24
  ***************************************************************************/
25 25
 
26
-#ifndef SMB4KGLOBAL_H
27
-#define SMB4KGLOBAL_H
26
+#ifndef SMB4TDEGLOBAL_H
27
+#define SMB4TDEGLOBAL_H
28 28
 
29 29
 #include <tqstring.h>
30 30
 #include <tqtimer.h>

+ 1
- 1
smb4k/iconview/Makefile.am View File

@@ -9,7 +9,7 @@ libsmb4ksharesiconview_la_LDFLAGS = -module -no-undefined $(all_libraries)
9 9
 noinst_HEADERS = smb4ksharesiconview.h smb4ksharesiconview_part.h \
10 10
 		smb4ksharesiconviewitem.h smb4ksharesiconviewtooltip.h
11 11
 libsmb4ksharesiconview_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
12
-	$(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_KIO) $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_KPARTS) \
12
+	$(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) \
13 13
 	$(LIB_QT)
14 14
 
15 15
 partrcdir = $(kde_datadir)/smb4ksharesiconviewpart

+ 1
- 1
smb4k/listview/Makefile.am View File

@@ -3,7 +3,7 @@ METASOURCES = AUTO
3 3
 
4 4
 kde_module_LTLIBRARIES = libsmb4kshareslistview.la
5 5
 libsmb4kshareslistview_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
6
-	$(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_KIO) $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_KPARTS) \
6
+	$(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) \
7 7
 	$(LIB_QT)
8 8
 libsmb4kshareslistview_la_LDFLAGS = -module -no-undefined $(all_libraries)
9 9
 

+ 1
- 1
smb4k/searchdlg/Makefile.am View File

@@ -2,7 +2,7 @@ INCLUDES = $(all_includes)
2 2
 METASOURCES = AUTO
3 3
 kde_module_LTLIBRARIES = libsmb4ksearchdialog.la
4 4
 libsmb4ksearchdialog_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
5
-	$(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_KPARTS) $(LIB_QT)
5
+	$(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_QT)
6 6
 noinst_HEADERS = smb4ksearchdialog.h smb4ksearchdialog_part.h \
7 7
 	smb4ksearchdialogitem.h
8 8
 libsmb4ksearchdialog_la_SOURCES = smb4ksearchdialog.cpp \

Loading…
Cancel
Save