summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TODO2
-rw-r--r--acinclude.m424
-rw-r--r--plugin/Makefile.am2
-rw-r--r--po/de.po4
-rw-r--r--po/es.po4
-rw-r--r--po/it.po4
-rw-r--r--po/ja.po4
-rw-r--r--po/sv.po4
-rw-r--r--po/uk.po4
-rw-r--r--smb4k/Makefile.am4
-rw-r--r--smb4k/browser/Makefile.am2
-rw-r--r--smb4k/configdlg/smb4tdeconfigdialog.h4
-rw-r--r--smb4k/configdlg/smb4tdersyncoptions.h4
-rw-r--r--smb4k/core/Makefile.am2
-rw-r--r--smb4k/core/smb4kcore.cpp2
-rw-r--r--smb4k/core/smb4tdeglobal.h4
-rw-r--r--smb4k/iconview/Makefile.am2
-rw-r--r--smb4k/listview/Makefile.am2
-rw-r--r--smb4k/searchdlg/Makefile.am2
19 files changed, 40 insertions, 40 deletions
diff --git a/TODO b/TODO
index 4b8a761..d4e9fba 100644
--- a/TODO
+++ b/TODO
@@ -43,7 +43,7 @@ for 0.10.x:
...
Deferred:
-- Introduce a smb4k:/ kio slave?
+- Introduce a smb4k:/ tdeio slave?
- Support SELinux.
- Make it configurable if the workgroup master browser should be queried
to retrieve the comment etc. for a host or not when using the IP scan
diff --git a/acinclude.m4 b/acinclude.m4
index 108d485..621ee30 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2070,35 +2070,35 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
- AC_SUBST(LIB_KIO, "-ltdeio")
+ AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEABC, "-ltdeabc")
AC_SUBST(LIB_TDEHTML, "-ltdehtml")
- AC_SUBST(LIB_KSPELL, "-ltdespell")
- AC_SUBST(LIB_KPARTS, "-ltdeparts")
+ AC_SUBST(LIB_TDESPELL, "-ltdespell")
+ AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
- AC_SUBST(LIB_KUTILS, "-ltdeutils")
+ AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim")
- AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
+ AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
- AC_SUBST(LIB_KDNSSD, "-ltdednssd")
- AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
+ AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
+ AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# these are for backward compatibility
- AC_SUBST(LIB_KSYCOCA, "-ltdeio")
+ AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
- AC_SUBST(LIB_KIO, "-ltdeio")
- AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
+ AC_SUBST(LIB_TDEIO, "-ltdeio")
+ AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_TDEFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEHTML, "-ltdehtml")
- AC_SUBST(LIB_KSPELL, "-ltdespell")
- AC_SUBST(LIB_KPARTS, "-ltdeparts")
+ AC_SUBST(LIB_TDESPELL, "-ltdespell")
+ AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
diff --git a/plugin/Makefile.am b/plugin/Makefile.am
index 203fa65..4fff121 100644
--- a/plugin/Makefile.am
+++ b/plugin/Makefile.am
@@ -5,7 +5,7 @@ konqsidebar_smb4k_la_SOURCES = smb4k_konqplugin.cpp
konqsidebar_smb4k_la_LDFLAGS = -module $(all_libraries) \
-L$(top_builddir)/smb4k/core -L$(topbuild_dir)/smb4k/widgets -lkonqsidebarplugin
konqsidebar_smb4k_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
- $(KDE_PLUGIN) $(LIB_TDEFILE) $(LIB_KPARTS) $(LIB_QT) $(LIB_TDECORE) \
+ $(KDE_PLUGIN) $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_QT) $(LIB_TDECORE) \
$(LIB_TDEUI)
globaladddir = $(kde_datadir)/konqsidebartng/add
diff --git a/po/de.po b/po/de.po
index 7483e12..e832e0d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1355,11 +1355,11 @@ msgstr "Smb4KNetworkBrowserPart"
#: smb4k/core/smb4kcore.cpp:248
msgid ""
-"Up to KDE 3.3.x, KIO and Konqueror cannot handle CIFS shares. Konqueror will "
+"Up to KDE 3.3.x, TDEIO and Konqueror cannot handle CIFS shares. Konqueror will "
"hang if you try to access it.\n"
"Do you want to continue?"
msgstr ""
-"Bis einschließlich KDE 3.3.x können KIO und Konqueror CIFS-Freigaben nicht "
+"Bis einschließlich KDE 3.3.x können TDEIO und Konqueror CIFS-Freigaben nicht "
"handhaben. Konqueror wird sich aufhängen, falls Sie versuchen, auf die "
"Freigaben zuzugreifen.\n"
"Wollen Sie fortfahren?"
diff --git a/po/es.po b/po/es.po
index 5d451fe..5ad3c3d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1342,11 +1342,11 @@ msgstr "Smb4KNetworkBrowserPart"
#: smb4k/core/smb4kcore.cpp:248
msgid ""
-"Up to KDE 3.3.x, KIO and Konqueror cannot handle CIFS shares. Konqueror will "
+"Up to KDE 3.3.x, TDEIO and Konqueror cannot handle CIFS shares. Konqueror will "
"hang if you try to access it.\n"
"Do you want to continue?"
msgstr ""
-"Hasta KDE 3.3.x, KIO y Konqueror no pueden manejar recursos compartidos "
+"Hasta KDE 3.3.x, TDEIO y Konqueror no pueden manejar recursos compartidos "
"CIFS. Konqueror fallará si intenta acceder a uno.\n"
"¿Desea continuar?"
diff --git a/po/it.po b/po/it.po
index 701c33e..253bd54 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1374,11 +1374,11 @@ msgstr "Browser di rete"
#: smb4k/core/smb4kcore.cpp:248
msgid ""
-"Up to KDE 3.3.x, KIO and Konqueror cannot handle CIFS shares. Konqueror will "
+"Up to KDE 3.3.x, TDEIO and Konqueror cannot handle CIFS shares. Konqueror will "
"hang if you try to access it.\n"
"Do you want to continue?"
msgstr ""
-"Fino alla versione 3.3.x di KDE, KIO e Konqueror non supportano le "
+"Fino alla versione 3.3.x di KDE, TDEIO e Konqueror non supportano le "
"condivisioni CIFS. Konqueror andrà in blocco se si tenta di accedere ad una "
"di esse.\n"
"Si desidera continuare?"
diff --git a/po/ja.po b/po/ja.po
index 5a2daee..1d649f5 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1349,11 +1349,11 @@ msgstr "Smb4KNetworkBrowserPart"
#: smb4k/core/smb4kcore.cpp:248
msgid ""
-"Up to KDE 3.3.x, KIO and Konqueror cannot handle CIFS shares. Konqueror will "
+"Up to KDE 3.3.x, TDEIO and Konqueror cannot handle CIFS shares. Konqueror will "
"hang if you try to access it.\n"
"Do you want to continue?"
msgstr ""
-"KDE 3.3.x にバージョンアップしてください。 KIO と Konquerorは、CIFS 共有を扱"
+"KDE 3.3.x にバージョンアップしてください。 TDEIO と Konquerorは、CIFS 共有を扱"
"うことができません。あなたが、CIFS にアクセスしようとすれば、konqueror は、ハ"
"ングするでしょう。\n"
"それでも、あなたは、続行しますか？"
diff --git a/po/sv.po b/po/sv.po
index 89050df..d1d74d4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3604,11 +3604,11 @@ msgstr ""
#: smb4k/core/smb4kcore.cpp:248
#, fuzzy
msgid ""
-"Up to KDE 3.3.x, KIO and Konqueror cannot handle CIFS shares. Konqueror will "
+"Up to KDE 3.3.x, TDEIO and Konqueror cannot handle CIFS shares. Konqueror will "
"hang if you try to access it.\n"
"Do you want to continue?"
msgstr ""
-"Minst till version 3.3.2 från KDE och KIO. Det är inte mögligt att hantera "
+"Minst till version 3.3.2 från KDE och TDEIO. Det är inte mögligt att hantera "
"CIFS-Kataloger. Konqueror misslyckades, om du använder det.\n"
" Vill du fortsätter?"
diff --git a/po/uk.po b/po/uk.po
index e159d72..fbb4d2c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1395,11 +1395,11 @@ msgstr "Smb4KNetworkBrowserPart"
#: smb4k/core/smb4kcore.cpp:248
msgid ""
-"Up to KDE 3.3.x, KIO and Konqueror cannot handle CIFS shares. Konqueror will "
+"Up to KDE 3.3.x, TDEIO and Konqueror cannot handle CIFS shares. Konqueror will "
"hang if you try to access it.\n"
"Do you want to continue?"
msgstr ""
-"До версії KDE 3.3.x, KIO і Konqueror не можуть працювати зі спільними "
+"До версії KDE 3.3.x, TDEIO і Konqueror не можуть працювати зі спільними "
"ресурсами CIFS. Konqueror зависає при спробі доступу до них.\n"
"Хочете продовжити?"
diff --git a/smb4k/Makefile.am b/smb4k/Makefile.am
index 2d803ba..3f6f582 100644
--- a/smb4k/Makefile.am
+++ b/smb4k/Makefile.am
@@ -8,8 +8,8 @@ bin_PROGRAMS = smb4k
smb4k_SOURCES = main.cpp smb4k.cpp smb4ksystemtray.cpp
smb4k_LDADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
- $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIB_KPARTS) $(LIB_QT)
-smb4k_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+ $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_QT)
+smb4k_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
KDE_ICON = smb4k
diff --git a/smb4k/browser/Makefile.am b/smb4k/browser/Makefile.am
index a10c4f7..e013c44 100644
--- a/smb4k/browser/Makefile.am
+++ b/smb4k/browser/Makefile.am
@@ -8,7 +8,7 @@ libsmb4knetworkbrowser_la_SOURCES = smb4knetworkbrowser_part.cpp \
smb4knetworkbrowsertooltip.cpp
libsmb4knetworkbrowser_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
$(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDECORE) \
- $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_KPARTS) $(LIB_QT)
+ $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_QT)
libsmb4knetworkbrowser_la_LDFLAGS = -module -no-undefined $(all_libraries)
partrcdir = $(kde_datadir)/smb4knetworkbrowserpart
diff --git a/smb4k/configdlg/smb4tdeconfigdialog.h b/smb4k/configdlg/smb4tdeconfigdialog.h
index 6af3773..3a95405 100644
--- a/smb4k/configdlg/smb4tdeconfigdialog.h
+++ b/smb4k/configdlg/smb4tdeconfigdialog.h
@@ -23,8 +23,8 @@
* MA 02110-1301 USA *
***************************************************************************/
-#ifndef SMB4KCONFIGDIALOG_H
-#define SMB4KCONFIGDIALOG_H
+#ifndef SMB4TDECONFIGDIALOG_H
+#define SMB4TDECONFIGDIALOG_H
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/smb4k/configdlg/smb4tdersyncoptions.h b/smb4k/configdlg/smb4tdersyncoptions.h
index 2d7a2e2..7a9bc13 100644
--- a/smb4k/configdlg/smb4tdersyncoptions.h
+++ b/smb4k/configdlg/smb4tdersyncoptions.h
@@ -23,8 +23,8 @@
* MA 02110-1301 USA *
***************************************************************************/
-#ifndef SMB4KRSYNCOPTIONS_H
-#define SMB4KRSYNCOPTIONS_H
+#ifndef SMB4TDERSYNCOPTIONS_H
+#define SMB4TDERSYNCOPTIONS_H
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/smb4k/core/Makefile.am b/smb4k/core/Makefile.am
index 821daba..5af77dd 100644
--- a/smb4k/core/Makefile.am
+++ b/smb4k/core/Makefile.am
@@ -18,7 +18,7 @@ libsmb4kcore_la_SOURCES = smb4kauthinfo.cpp smb4kbookmark.cpp \
smb4kprint.cpp smb4kprintinfo.cpp smb4ksambaoptionshandler.cpp \
smb4ksambaoptionsinfo.cpp smb4kscanner.cpp smb4kscanner_p.cpp smb4ksettings.kcfgc smb4kshare.cpp \
smb4ksynchronizationinfo.cpp smb4ksynchronizer.cpp
-libsmb4kcore_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_QT)
+libsmb4kcore_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_QT)
kde_kcfg_DATA = smb4k.kcfg
diff --git a/smb4k/core/smb4kcore.cpp b/smb4k/core/smb4kcore.cpp
index 91e92ab..8319ff4 100644
--- a/smb4k/core/smb4kcore.cpp
+++ b/smb4k/core/smb4kcore.cpp
@@ -245,7 +245,7 @@ void Smb4KCore::open( Smb4KShare *share, int openWith )
if ( TQString::compare( share->filesystem(), "cifs" ) == 0 )
{
- 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 )
+ 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 )
{
return;
}
diff --git a/smb4k/core/smb4tdeglobal.h b/smb4k/core/smb4tdeglobal.h
index c6da2a4..b173d1b 100644
--- a/smb4k/core/smb4tdeglobal.h
+++ b/smb4k/core/smb4tdeglobal.h
@@ -23,8 +23,8 @@
* MA 02110-1301 USA *
***************************************************************************/
-#ifndef SMB4KGLOBAL_H
-#define SMB4KGLOBAL_H
+#ifndef SMB4TDEGLOBAL_H
+#define SMB4TDEGLOBAL_H
#include <tqstring.h>
#include <tqtimer.h>
diff --git a/smb4k/iconview/Makefile.am b/smb4k/iconview/Makefile.am
index 6c03d0c..f3b05ff 100644
--- a/smb4k/iconview/Makefile.am
+++ b/smb4k/iconview/Makefile.am
@@ -9,7 +9,7 @@ libsmb4ksharesiconview_la_LDFLAGS = -module -no-undefined $(all_libraries)
noinst_HEADERS = smb4ksharesiconview.h smb4ksharesiconview_part.h \
smb4ksharesiconviewitem.h smb4ksharesiconviewtooltip.h
libsmb4ksharesiconview_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
- $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_KIO) $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_KPARTS) \
+ $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) \
$(LIB_QT)
partrcdir = $(kde_datadir)/smb4ksharesiconviewpart
diff --git a/smb4k/listview/Makefile.am b/smb4k/listview/Makefile.am
index 8fb182b..0d87334 100644
--- a/smb4k/listview/Makefile.am
+++ b/smb4k/listview/Makefile.am
@@ -3,7 +3,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = libsmb4kshareslistview.la
libsmb4kshareslistview_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
- $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_KIO) $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_KPARTS) \
+ $(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) \
$(LIB_QT)
libsmb4kshareslistview_la_LDFLAGS = -module -no-undefined $(all_libraries)
diff --git a/smb4k/searchdlg/Makefile.am b/smb4k/searchdlg/Makefile.am
index bef68fc..2ff442a 100644
--- a/smb4k/searchdlg/Makefile.am
+++ b/smb4k/searchdlg/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = $(all_includes)
METASOURCES = AUTO
kde_module_LTLIBRARIES = libsmb4ksearchdialog.la
libsmb4ksearchdialog_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
- $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_KPARTS) $(LIB_QT)
+ $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_QT)
noinst_HEADERS = smb4ksearchdialog.h smb4ksearchdialog_part.h \
smb4ksearchdialogitem.h
libsmb4ksearchdialog_la_SOURCES = smb4ksearchdialog.cpp \
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-29 03:00:14 +0000