summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-09-03 19:56:53 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-09-03 19:56:53 +0200
commit10fab8b8e0132c7e3a0273751861610a8c55d665 (patch)
tree0b25f14c855f30b479eeb74a77eeea2a3f8fa475
parentbc2ff3c2cfbb327081b80e731a12fc66523a80b2 (diff)
downloadkchmviewer-10fab8b8e0132c7e3a0273751861610a8c55d665.tar.gz
kchmviewer-10fab8b8e0132c7e3a0273751861610a8c55d665.zip
Additional k => tde renaming and fixes
-rw-r--r--FAQ2
-rw-r--r--README4
-rw-r--r--acinclude.m424
m---------admin0
-rw-r--r--lib/Makefile.am8
-rw-r--r--lib/libchmfile/libchmurlfactory.h2
-rw-r--r--lib/tdeio-msits/Makefile.am (renamed from lib/kio-msits/Makefile.am)2
-rw-r--r--lib/tdeio-msits/kchmviewer.desktop (renamed from lib/kio-msits/kchmviewer.desktop)0
-rwxr-xr-xlib/tdeio-msits/msits.cpp (renamed from lib/kio-msits/msits.cpp)2
-rwxr-xr-xlib/tdeio-msits/msits.h (renamed from lib/kio-msits/msits.h)0
-rwxr-xr-xlib/tdeio-msits/msits.protocol (renamed from lib/kio-msits/msits.protocol)0
-rw-r--r--src/Makefile.am4
-rw-r--r--src/kchmviewwindow.cpp2
13 files changed, 25 insertions, 25 deletions
diff --git a/FAQ b/FAQ
index 6cca480..09ea758 100644
--- a/FAQ
+++ b/FAQ
@@ -4,7 +4,7 @@ Q: The book shows without any problem using QTextWidget browser, but when I use
An error occurred while loading ms-its:/home/user/SymphonyFrameWork.chm::/index.html
Thefileorfolderms-its:/home/user/SymphonyFrameWork.chm::/index.htmldoesnotexist.
-A: You have tdeio_chm installed, and because it installs itself as KIO slave for ms-its, sometime KDE uses it instead of tdeio_msits.
+A: You have tdeio_chm installed, and because it installs itself as TDEIO slave for ms-its, sometime KDE uses it instead of tdeio_msits.
To disable it, find the file chm.protocol in your KDE directory, and remove it. Then run tdeinit to reread the configuration.
diff --git a/README b/README
index 218c864..c68e440 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@
KchmViewer is a chm (MS HTML help file format) viewer, written in C++. Unlike most existing CHM viewers for Unix,
it uses Trolltech Qt widget library, and does not depend on KDE or Gnome. However, it may be compiled with full
- KDE support, including KDE widgets and KIO/TDEHTML.
+ KDE support, including KDE widgets and TDEIO/TDEHTML.
The main advantage of KchmViewer is extended support for non-English languages. Unlike others, KchmViewer in most
cases correctly detects chm file encoding, correctly shows tables of context of Russian, Korean, Chinese and
@@ -15,7 +15,7 @@
2. FEATURES
- Standalone viewer, depends on Qt only. Does not require KDE, Gnome or wxWindows toolkit.
- - A KDE viewer can be compiled optionally, with KIO slave, TDEHTML and K*Widget support.
+ - A KDE viewer can be compiled optionally, with TDEIO slave, TDEHTML and K*Widget support.
- Completely safe and harmless. Does not support JavaScript in any way, optionally warns you before opening an
external web page, or switching to another help file.
- Correctly detects and shows encoding of any valid chm file.
diff --git a/acinclude.m4 b/acinclude.m4
index b6e2124..f598aa8 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/admin b/admin
-Subproject b4d585c643d92787bfa17b935ce00b09960ee36
+Subproject 6b7f7225eff4c49b2dd71804d5fdacb03efcf46
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 696d2a8..fcf2131 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,17 +1,17 @@
if AMC_USE_KDE
-SUBDIR_KIO = kio-msits
+SUBDIR_TDEIO = tdeio-msits
endif
if AMC_BUILD_CHMLIB
SUBDIR_CHMLIB = chmlib
endif
-SUBDIRS = $(SUBDIR_CHMLIB) $(SUBDIR_KIO) libchmfile
-DIST_SUBDIRS = chmlib kio-msits libchmfile
+SUBDIRS = $(SUBDIR_CHMLIB) $(SUBDIR_TDEIO) libchmfile
+DIST_SUBDIRS = chmlib tdeio-msits libchmfile
package-messages:
$(MAKE) -f admin/Makefile.common package-messages
$(MAKE) -C po merge
# Uncomment this line before opening the project in tdevelop for the first time!
-#SUBDIRS = chmlib kio-msits libchmfile
+#SUBDIRS = chmlib tdeio-msits libchmfile
diff --git a/lib/libchmfile/libchmurlfactory.h b/lib/libchmfile/libchmurlfactory.h
index 343ac75..a897138 100644
--- a/lib/libchmfile/libchmurlfactory.h
+++ b/lib/libchmfile/libchmurlfactory.h
@@ -98,7 +98,7 @@ static inline TQString makeURLabsoluteIfNeeded( const TQString & url )
}
-// Returns a special string, which allows the kio-slave, or viewwindow-browser iteraction
+// Returns a special string, which allows the tdeio-slave, or viewwindow-browser iteraction
// to regognize our own internal urls, which is necessary to show image-only pages.
static inline TQString getInternalUriExtension()
{
diff --git a/lib/kio-msits/Makefile.am b/lib/tdeio-msits/Makefile.am
index 9bd5cff..37e1b64 100644
--- a/lib/kio-msits/Makefile.am
+++ b/lib/tdeio-msits/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = tdeio_msits.la
tdeio_msits_la_SOURCES = msits.cpp
tdeio_msits_la_LIBADD = -ltdeio $(CHM_LIBS)
-tdeio_msits_la_LDFLAGS = -module -avoid-version $(KDE_LDFLAGS) $(LIB_QT) $(LIB_KIO) $(LIB_TDECORE) $(KDE_PLUGIN) $(QT_LDFLAGS)
+tdeio_msits_la_LDFLAGS = -module -avoid-version $(KDE_LDFLAGS) $(LIB_QT) $(LIB_TDEIO) $(LIB_TDECORE) $(KDE_PLUGIN) $(QT_LDFLAGS)
protocol_DATA = msits.protocol
protocoldir = $(kde_servicesdir)
diff --git a/lib/kio-msits/kchmviewer.desktop b/lib/tdeio-msits/kchmviewer.desktop
index 31558d8..31558d8 100644
--- a/lib/kio-msits/kchmviewer.desktop
+++ b/lib/tdeio-msits/kchmviewer.desktop
diff --git a/lib/kio-msits/msits.cpp b/lib/tdeio-msits/msits.cpp
index 3e847f1..28d2821 100755
--- a/lib/kio-msits/msits.cpp
+++ b/lib/tdeio-msits/msits.cpp
@@ -191,7 +191,7 @@ bool ProtocolMSITS::parseLoadAndLookup ( const KURL& url, TQString& abspath )
}
/*
- * Shamelessly stolen from a KDE KIO tutorial
+ * Shamelessly stolen from a KDE TDEIO tutorial
*/
static void app_entry(UDSEntry& e, unsigned int uds, const TQString& str)
{
diff --git a/lib/kio-msits/msits.h b/lib/tdeio-msits/msits.h
index 4248908..4248908 100755
--- a/lib/kio-msits/msits.h
+++ b/lib/tdeio-msits/msits.h
diff --git a/lib/kio-msits/msits.protocol b/lib/tdeio-msits/msits.protocol
index bc1d65f..bc1d65f 100755
--- a/lib/kio-msits/msits.protocol
+++ b/lib/tdeio-msits/msits.protocol
diff --git a/src/Makefile.am b/src/Makefile.am
index 587ee65..e14ed77 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,8 +19,8 @@ SUBDIRS = $(LIB_KDEEXTRADIR) . pics
# the library search path.
kchmviewer_LDADD = $(top_builddir)/lib/libchmfile/libchmfile.a $(LIB_KDEEXTRA) \
- $(CHM_LIBS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_KPARTS) $(LIB_KIO)
-kchmviewer_LDFLAGS = $(QT_LDFLAGS) $(KDE_LDFLAGS) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KIO) -L../lib/chmlib/
+ $(CHM_LIBS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_TDEPARTS) $(LIB_TDEIO)
+kchmviewer_LDFLAGS = $(QT_LDFLAGS) $(KDE_LDFLAGS) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO) -L../lib/chmlib/
METASOURCES = AUTO
KDE_OPTIONS = qtonly
diff --git a/src/kchmviewwindow.cpp b/src/kchmviewwindow.cpp
index f776efe..71e0813 100644
--- a/src/kchmviewwindow.cpp
+++ b/src/kchmviewwindow.cpp
@@ -102,7 +102,7 @@ bool KCHMViewWindow::openUrl ( const TQString& origurl )
return true;
// URL could be a complete ms-its link. The file should be already loaded (for TQTextBrowser),
- // or will be loaded (for kio slave). We care only about the path component.
+ // or will be loaded (for tdeio slave). We care only about the path component.
if ( LCHMUrlFactory::isNewChmURL( newurl, chmfile, page ) )
{
// If a new chm file is opened here, and we do not use KCHMLPart, we better abort