From d1e0cc99a202cef3306b90b8839a6726e89f201e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:21:04 -0600 Subject: Rename many classes and header files to avoid conflicts with KDE4 --- tdeio/bookmarks/kbookmarkbar.cc | 6 +++--- tdeio/bookmarks/kbookmarkbar.h | 2 +- tdeio/bookmarks/kbookmarkmanager.h | 2 +- tdeio/bookmarks/kbookmarkmenu.cc | 4 ++-- tdeio/bookmarks/kbookmarkmenu.h | 2 +- tdeio/bookmarks/kbookmarkmenu_p.h | 2 +- tdeio/misc/uiserver.cpp | 4 ++-- tdeio/misc/uiserver.h | 4 ++-- tdeio/tdefile/CMakeLists.txt | 6 +++--- tdeio/tdefile/Makefile.am | 8 ++++---- tdeio/tdefile/kacleditwidget.h | 2 +- tdeio/tdefile/kacleditwidget_p.h | 2 +- tdeio/tdefile/kcustommenueditor.cpp | 2 +- tdeio/tdefile/kdiroperator.cpp | 6 +++--- tdeio/tdefile/kdiroperator.h | 2 +- tdeio/tdefile/kdirselectdialog.cpp | 4 ++-- tdeio/tdefile/kencodingfiledialog.cpp | 4 ++-- tdeio/tdefile/knotifydialog.h | 2 +- tdeio/tdefile/knotifywidgetbase.ui | 2 +- tdeio/tdefile/kopenwith.cpp | 2 +- tdeio/tdefile/kopenwith_p.h | 2 +- tdeio/tdefile/kpropertiesdesktopbase.ui | 2 +- tdeio/tdefile/kpropertiesdialog.cpp | 2 +- tdeio/tdefile/kpropertiesmimetypebase.ui | 2 +- tdeio/tdefile/kurlbar.h | 2 +- tdeio/tdefile/kurlrequester.cpp | 2 +- tdeio/tdefile/kurlrequesterdlg.cpp | 4 ++-- tdeio/tdefile/tdefilebookmarkhandler.cpp | 2 +- tdeio/tdefile/tdefiledetailview.h | 2 +- tdeio/tdefile/tdefiledialog.cpp | 14 +++++++------- tdeio/tdefile/tdefileiconview.cpp | 2 +- tdeio/tdefile/tdefilepreview.cpp | 2 +- tdeio/tdefile/tdefiletreeview.h | 2 +- tdeio/tdefile/tdefiletreeviewitem.h | 2 +- tdeio/tdefile/tdefileview.cpp | 2 +- tdeio/tdefile/tderecentdirs.cpp | 4 ++-- tdeio/tdefile/tderecentdocument.cpp | 2 +- tdeio/tdefile/tests/tdefiletreeviewtest.cpp | 2 +- tdeio/tdeio/job.cpp | 2 +- tdeio/tdeio/kdatatool.h | 2 +- tdeio/tdeio/kmimetypechooser.cpp | 2 +- tdeio/tdeio/krun.cpp | 2 +- tdeio/tdeio/kurifilter.h | 6 +++--- tdeio/tests/kurifiltertest.cpp | 28 ++++++++++++++-------------- tdeio/tests/tdeioslavetest.h | 2 +- 45 files changed, 82 insertions(+), 82 deletions(-) (limited to 'tdeio') diff --git a/tdeio/bookmarks/kbookmarkbar.cc b/tdeio/bookmarks/kbookmarkbar.cc index b1ebb94fa..5c5f64ecc 100644 --- a/tdeio/bookmarks/kbookmarkbar.cc +++ b/tdeio/bookmarks/kbookmarkbar.cc @@ -28,11 +28,11 @@ #include #include -#include -#include +#include +#include #include -#include +#include #include "kbookmarkdrag.h" #include "kbookmarkmenu_p.h" diff --git a/tdeio/bookmarks/kbookmarkbar.h b/tdeio/bookmarks/kbookmarkbar.h index 2f5495cda..93241cdaf 100644 --- a/tdeio/bookmarks/kbookmarkbar.h +++ b/tdeio/bookmarks/kbookmarkbar.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include class TDEToolBar; class KBookmarkMenu; diff --git a/tdeio/bookmarks/kbookmarkmanager.h b/tdeio/bookmarks/kbookmarkmanager.h index 4a129704a..6931e9842 100644 --- a/tdeio/bookmarks/kbookmarkmanager.h +++ b/tdeio/bookmarks/kbookmarkmanager.h @@ -167,7 +167,7 @@ public: /** * @return true if the NS bookmarks should be dynamically shown - * in the toplevel kactionmenu + * in the toplevel tdeactionmenu * @deprecated */ bool showNSBookmarks() const; diff --git a/tdeio/bookmarks/kbookmarkmenu.cc b/tdeio/bookmarks/kbookmarkmenu.cc index ff9f8d4ec..c99d02284 100644 --- a/tdeio/bookmarks/kbookmarkmenu.cc +++ b/tdeio/bookmarks/kbookmarkmenu.cc @@ -34,8 +34,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/tdeio/bookmarks/kbookmarkmenu.h b/tdeio/bookmarks/kbookmarkmenu.h index 003077202..0c1ebb27c 100644 --- a/tdeio/bookmarks/kbookmarkmenu.h +++ b/tdeio/bookmarks/kbookmarkmenu.h @@ -31,7 +31,7 @@ #include #include -#include +#include #include "kbookmark.h" #include "kbookmarkmanager.h" diff --git a/tdeio/bookmarks/kbookmarkmenu_p.h b/tdeio/bookmarks/kbookmarkmenu_p.h index dff3e6f30..fc34e9029 100644 --- a/tdeio/bookmarks/kbookmarkmenu_p.h +++ b/tdeio/bookmarks/kbookmarkmenu_p.h @@ -31,7 +31,7 @@ #include #include -#include +#include #include "kbookmark.h" #include "kbookmarkimporter.h" diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp index 4f4b720f5..abe918854 100644 --- a/tdeio/misc/uiserver.cpp +++ b/tdeio/misc/uiserver.cpp @@ -41,8 +41,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/tdeio/misc/uiserver.h b/tdeio/misc/uiserver.h index c86886bac..05b15ba18 100644 --- a/tdeio/misc/uiserver.h +++ b/tdeio/misc/uiserver.h @@ -27,9 +27,9 @@ #include #include #include -#include +#include #include -#include +#include #include class ListProgress; diff --git a/tdeio/tdefile/CMakeLists.txt b/tdeio/tdefile/CMakeLists.txt index 4fa7b3e82..a69cad536 100644 --- a/tdeio/tdefile/CMakeLists.txt +++ b/tdeio/tdefile/CMakeLists.txt @@ -33,7 +33,7 @@ install( FILES tdefiledialog.h kencodingfiledialog.h kdiroperator.h tdefileview.h tdefilefiltercombo.h tdefiledetailview.h kcombiview.h kdiskfreesp.h - tdefileiconview.h krecentdocument.h + tdefileiconview.h tderecentdocument.h kurlrequester.h tdefilepreview.h tdefile.h kurlcombobox.h kurlrequesterdlg.h kopenwith.h kpropsdlg.h kicondialog.h kdirsize.h kpreviewwidgetbase.h kimagefilepreview.h tdefilesharedlg.h @@ -56,11 +56,11 @@ set( target tdefile ) set( ${target}_SRCS tdefilefiltercombo.cpp tdefileview.cpp tdefileiconview.cpp - krecentdocument.cpp tdefiledialog.cpp kdiroperator.cpp + tderecentdocument.cpp tdefiledialog.cpp kdiroperator.cpp tdefiledetailview.cpp kcombiview.cpp kurlrequester.cpp tdefilepreview.cpp kurlcombobox.cpp kurlrequesterdlg.cpp kopenwith.cpp kpropertiesdialog.cpp kicondialog.cpp - kdirsize.cpp krecentdirs.cpp kdiskfreesp.cpp kimagefilepreview.cpp + kdirsize.cpp tderecentdirs.cpp kdiskfreesp.cpp kimagefilepreview.cpp tdefilesharedlg.cpp kurlbar.cpp kmetaprops.cpp kpreviewprops.cpp tdefiletreeview.cpp tdefiletreeviewitem.cpp tdefiletreebranch.cpp kdirselectdialog.cpp tdefilebookmarkhandler.cpp tdefilemetainfowidget.cpp diff --git a/tdeio/tdefile/Makefile.am b/tdeio/tdefile/Makefile.am index ab8561e7c..4e6b76ce1 100644 --- a/tdeio/tdefile/Makefile.am +++ b/tdeio/tdefile/Makefile.am @@ -29,7 +29,7 @@ METASOURCES = AUTO include_HEADERS = tdefiledialog.h kencodingfiledialog.h\ kdiroperator.h tdefileview.h tdefilefiltercombo.h \ tdefiledetailview.h kcombiview.h kdiskfreesp.h \ - tdefileiconview.h krecentdocument.h \ + tdefileiconview.h tderecentdocument.h \ kurlrequester.h tdefilepreview.h tdefile.h \ kurlcombobox.h kurlrequesterdlg.h kopenwith.h kpropsdlg.h \ kicondialog.h kdirsize.h kpreviewwidgetbase.h kimagefilepreview.h tdefilesharedlg.h \ @@ -37,18 +37,18 @@ include_HEADERS = tdefiledialog.h kencodingfiledialog.h\ kdirselectdialog.h kurlbar.h kpropertiesdialog.h knotifydialog.h \ kcustommenueditor.h knotifywidgetbase.h -noinst_HEADERS = config-tdefile.h krecentdirs.h kmetaprops.h \ +noinst_HEADERS = config-tdefile.h tderecentdirs.h kmetaprops.h \ tdefilebookmarkhandler.h tdefilemetainfowidget.h kopenwith_p.h \ tdefilespeedbar.h kpreviewprops.h kacleditwidget.h kacleditwidget_p.h images.h libtdefile_la_SOURCES = \ tdefilefiltercombo.cpp \ tdefileview.cpp tdefileiconview.cpp \ - krecentdocument.cpp tdefiledialog.cpp kdiroperator.cpp \ + tderecentdocument.cpp tdefiledialog.cpp kdiroperator.cpp \ tdefiledetailview.cpp kcombiview.cpp kurlrequester.cpp \ tdefilepreview.cpp kurlcombobox.cpp kurlrequesterdlg.cpp \ kopenwith.cpp kpropertiesdialog.cpp kicondialog.cpp kdirsize.cpp \ - krecentdirs.cpp kdiskfreesp.cpp kimagefilepreview.cpp tdefilesharedlg.cpp \ + tderecentdirs.cpp kdiskfreesp.cpp kimagefilepreview.cpp tdefilesharedlg.cpp \ kurlbar.cpp kmetaprops.cpp kpreviewprops.cpp \ tdefiletreeview.cpp tdefiletreeviewitem.cpp tdefiletreebranch.cpp \ kdirselectdialog.cpp tdefilebookmarkhandler.cpp \ diff --git a/tdeio/tdefile/kacleditwidget.h b/tdeio/tdefile/kacleditwidget.h index c51cb94fc..43f4b2fca 100644 --- a/tdeio/tdefile/kacleditwidget.h +++ b/tdeio/tdefile/kacleditwidget.h @@ -30,7 +30,7 @@ #ifdef USE_POSIX_ACL -#include +#include #include #include diff --git a/tdeio/tdefile/kacleditwidget_p.h b/tdeio/tdefile/kacleditwidget_p.h index 9ea5e3203..41e265053 100644 --- a/tdeio/tdefile/kacleditwidget_p.h +++ b/tdeio/tdefile/kacleditwidget_p.h @@ -29,7 +29,7 @@ #endif // Q_MOC_RUN #ifdef USE_POSIX_ACL -#include +#include #include #include #include diff --git a/tdeio/tdefile/kcustommenueditor.cpp b/tdeio/tdefile/kcustommenueditor.cpp index 244e22e84..725048e37 100644 --- a/tdeio/tdefile/kcustommenueditor.cpp +++ b/tdeio/tdefile/kcustommenueditor.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tdeio/tdefile/kdiroperator.cpp b/tdeio/tdefile/kdiroperator.cpp index dcb457662..706b63164 100644 --- a/tdeio/tdefile/kdiroperator.cpp +++ b/tdeio/tdefile/kdiroperator.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include #include @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include "config-tdefile.h" diff --git a/tdeio/tdefile/kdiroperator.h b/tdeio/tdefile/kdiroperator.h index 5d806eee2..ca850b733 100644 --- a/tdeio/tdefile/kdiroperator.h +++ b/tdeio/tdefile/kdiroperator.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/tdeio/tdefile/kdirselectdialog.cpp b/tdeio/tdefile/kdirselectdialog.cpp index a540c57ef..e26c2cdf5 100644 --- a/tdeio/tdefile/kdirselectdialog.cpp +++ b/tdeio/tdefile/kdirselectdialog.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tdeio/tdefile/kencodingfiledialog.cpp b/tdeio/tdefile/kencodingfiledialog.cpp index 569217bee..a49210642 100644 --- a/tdeio/tdefile/kencodingfiledialog.cpp +++ b/tdeio/tdefile/kencodingfiledialog.cpp @@ -23,13 +23,13 @@ #include "kencodingfiledialog.h" #include -#include +#include #include #include #include #include #include -#include +#include struct KEncodingFileDialogPrivate { diff --git a/tdeio/tdefile/knotifydialog.h b/tdeio/tdefile/knotifydialog.h index ede51d663..f31815e34 100644 --- a/tdeio/tdefile/knotifydialog.h +++ b/tdeio/tdefile/knotifydialog.h @@ -19,7 +19,7 @@ #ifndef KNOTIFYDIALOG_H #define KNOTIFYDIALOG_H -#include +#include #include #include #include diff --git a/tdeio/tdefile/knotifywidgetbase.ui b/tdeio/tdefile/knotifywidgetbase.ui index 023da77d8..89591b1b8 100644 --- a/tdeio/tdefile/knotifywidgetbase.ui +++ b/tdeio/tdefile/knotifywidgetbase.ui @@ -458,7 +458,7 @@ kdialog.h - klistview.h + tdelistview.h kurlrequester.h klineedit.h kpushbutton.h diff --git a/tdeio/tdefile/kopenwith.cpp b/tdeio/tdefile/kopenwith.cpp index 8582e31f0..16876e356 100644 --- a/tdeio/tdefile/kopenwith.cpp +++ b/tdeio/tdefile/kopenwith.cpp @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include diff --git a/tdeio/tdefile/kopenwith_p.h b/tdeio/tdefile/kopenwith_p.h index ca9317fb6..a0f7eb77c 100644 --- a/tdeio/tdefile/kopenwith_p.h +++ b/tdeio/tdefile/kopenwith_p.h @@ -21,7 +21,7 @@ #define __open_with_p_h__ #include -#include +#include class KURLRequester; diff --git a/tdeio/tdefile/kpropertiesdesktopbase.ui b/tdeio/tdefile/kpropertiesdesktopbase.ui index 9c08eef93..28e1375c7 100644 --- a/tdeio/tdefile/kpropertiesdesktopbase.ui +++ b/tdeio/tdefile/kpropertiesdesktopbase.ui @@ -310,7 +310,7 @@ Following the command, you can have several place holders which will be replaced klineedit.h kurlrequester.h - klistview.h + tdelistview.h diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp index fdbef4fea..32644301a 100644 --- a/tdeio/tdefile/kpropertiesdialog.cpp +++ b/tdeio/tdefile/kpropertiesdialog.cpp @@ -122,7 +122,7 @@ extern "C" { #include #include #include -#include +#include #include #include "tdefilesharedlg.h" diff --git a/tdeio/tdefile/kpropertiesmimetypebase.ui b/tdeio/tdefile/kpropertiesmimetypebase.ui index 257eaa57c..1e1848206 100644 --- a/tdeio/tdefile/kpropertiesmimetypebase.ui +++ b/tdeio/tdefile/kpropertiesmimetypebase.ui @@ -64,7 +64,7 @@ - klistview.h + tdelistview.h diff --git a/tdeio/tdefile/kurlbar.h b/tdeio/tdefile/kurlbar.h index 7470ec82a..1219a6467 100644 --- a/tdeio/tdefile/kurlbar.h +++ b/tdeio/tdefile/kurlbar.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include class TDEConfig; diff --git a/tdeio/tdefile/kurlrequester.cpp b/tdeio/tdefile/kurlrequester.cpp index 88b34ea6b..1d5bf009e 100644 --- a/tdeio/tdefile/kurlrequester.cpp +++ b/tdeio/tdefile/kurlrequester.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/tdeio/tdefile/kurlrequesterdlg.cpp b/tdeio/tdefile/kurlrequesterdlg.cpp index 2459f984f..d1e9ec109 100644 --- a/tdeio/tdefile/kurlrequesterdlg.cpp +++ b/tdeio/tdefile/kurlrequesterdlg.cpp @@ -26,13 +26,13 @@ #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include diff --git a/tdeio/tdefile/tdefilebookmarkhandler.cpp b/tdeio/tdefile/tdefilebookmarkhandler.cpp index ef1f2a37b..1518b48e5 100644 --- a/tdeio/tdefile/tdefilebookmarkhandler.cpp +++ b/tdeio/tdefile/tdefilebookmarkhandler.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include "tdefiledialog.h" diff --git a/tdeio/tdefile/tdefiledetailview.h b/tdeio/tdefile/tdefiledetailview.h index 1e2d19a6b..2def9bf27 100644 --- a/tdeio/tdefile/tdefiledetailview.h +++ b/tdeio/tdefile/tdefiledetailview.h @@ -25,7 +25,7 @@ class KFileItem; class TQWidget; class TQKeyEvent; -#include +#include #include #include "tdefileview.h" diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp index f60692c88..034265065 100644 --- a/tdeio/tdefile/tdefiledialog.cpp +++ b/tdeio/tdefile/tdefiledialog.cpp @@ -42,8 +42,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -61,16 +61,16 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include #include #include -#include -#include +#include +#include #include #include #include @@ -81,7 +81,7 @@ #include #include -#include +#include #include #include #include diff --git a/tdeio/tdefile/tdefileiconview.cpp b/tdeio/tdefile/tdefileiconview.cpp index d42373893..ab4be248a 100644 --- a/tdeio/tdefile/tdefileiconview.cpp +++ b/tdeio/tdefile/tdefileiconview.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include #include diff --git a/tdeio/tdefile/tdefilepreview.cpp b/tdeio/tdefile/tdefilepreview.cpp index 4b336afee..57543ea8c 100644 --- a/tdeio/tdefile/tdefilepreview.cpp +++ b/tdeio/tdefile/tdefilepreview.cpp @@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA. */ -#include +#include #include #include #include diff --git a/tdeio/tdefile/tdefiletreeview.h b/tdeio/tdefile/tdefiletreeview.h index 3d6e039f5..da72709cd 100644 --- a/tdeio/tdefile/tdefiletreeview.h +++ b/tdeio/tdefile/tdefiletreeview.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/tdeio/tdefile/tdefiletreeviewitem.h b/tdeio/tdefile/tdefiletreeviewitem.h index 4455bff78..5ee6e035a 100644 --- a/tdeio/tdefile/tdefiletreeviewitem.h +++ b/tdeio/tdefile/tdefiletreeviewitem.h @@ -21,7 +21,7 @@ #define tdefile_tree_view_item_h #include -#include +#include #include #include diff --git a/tdeio/tdefile/tdefileview.cpp b/tdeio/tdefile/tdefileview.cpp index 01bc5e6b0..fb3cb0e9f 100644 --- a/tdeio/tdefile/tdefileview.cpp +++ b/tdeio/tdefile/tdefileview.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/tdeio/tdefile/tderecentdirs.cpp b/tdeio/tdefile/tderecentdirs.cpp index 0d8d008bd..12c2b6477 100644 --- a/tdeio/tdefile/tderecentdirs.cpp +++ b/tdeio/tdefile/tderecentdirs.cpp @@ -25,7 +25,7 @@ * SUCH DAMAGE. * */ -#include +#include #include #include #include @@ -52,7 +52,7 @@ static TDEConfig *recentdirs_readList(TQString &key, TQStringList &result, bool if (key[1] == ':') { key = key.mid(2); - config = new KSimpleConfig(TQString::fromLatin1("krecentdirsrc"), readOnly); + config = new KSimpleConfig(TQString::fromLatin1("tderecentdirsrc"), readOnly); } else { diff --git a/tdeio/tdefile/tderecentdocument.cpp b/tdeio/tdefile/tderecentdocument.cpp index 85af01c46..3d5ec44e7 100644 --- a/tdeio/tdefile/tderecentdocument.cpp +++ b/tdeio/tdefile/tderecentdocument.cpp @@ -25,7 +25,7 @@ * SUCH DAMAGE. * */ -#include +#include #include #include #include diff --git a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp index 008edb827..dfa59540d 100644 --- a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp +++ b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/tdeio/tdeio/job.cpp b/tdeio/tdeio/job.cpp index a29ffc4d0..eba15be03 100644 --- a/tdeio/tdeio/job.cpp +++ b/tdeio/tdeio/job.cpp @@ -49,7 +49,7 @@ extern "C" { #include #include #include -#include +#include #include #include diff --git a/tdeio/tdeio/kdatatool.h b/tdeio/tdeio/kdatatool.h index bd787dcd5..a77f8a9ea 100644 --- a/tdeio/tdeio/kdatatool.h +++ b/tdeio/tdeio/kdatatool.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include class KDataTool; diff --git a/tdeio/tdeio/kmimetypechooser.cpp b/tdeio/tdeio/kmimetypechooser.cpp index 7c74a9a41..95dfada9c 100644 --- a/tdeio/tdeio/kmimetypechooser.cpp +++ b/tdeio/tdeio/kmimetypechooser.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/tdeio/tdeio/krun.cpp b/tdeio/tdeio/krun.cpp index dd6de164c..69274ce24 100644 --- a/tdeio/tdeio/krun.cpp +++ b/tdeio/tdeio/krun.cpp @@ -37,7 +37,7 @@ #include "tdeio/scheduler.h" #include "tdeio/netaccess.h" #include "tdefile/kopenwith.h" -#include "tdefile/krecentdocument.h" +#include "tdefile/tderecentdocument.h" #include #include diff --git a/tdeio/tdeio/kurifilter.h b/tdeio/tdeio/kurifilter.h index fd7cb9b3c..cbd74d4e8 100644 --- a/tdeio/tdeio/kurifilter.h +++ b/tdeio/tdeio/kurifilter.h @@ -523,17 +523,17 @@ private: * of the filters you want to use to a TQStringList and invoke * the appropriate filtering function. The examples below show * the use of specific filters. The first one uses a single - * filter called kshorturifilter while the second example uses + * filter called tdeshorturifilter while the second example uses * multiple filters: * * \code * TQString text = "kde.org"; - * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" ); + * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" ); * \endcode * * \code * TQStringList list; - * list << "kshorturifilter" << "localdomainfilter"; + * list << "tdeshorturifilter" << "localdomainfilter"; * bool filtered = KURIFilter::self()->filterURI( text, list ); * \endcode * diff --git a/tdeio/tests/kurifiltertest.cpp b/tdeio/tests/kurifiltertest.cpp index 8e9785c24..414b5ebf1 100644 --- a/tdeio/tests/kurifiltertest.cpp +++ b/tdeio/tests/kurifiltertest.cpp @@ -182,13 +182,13 @@ int main(int argc, char **argv) // Enable verbosity for debugging { - KSimpleConfig cfg( "kshorturifilterrc" ); + KSimpleConfig cfg( "tdeshorturifilterrc" ); cfg.writeEntry( "Verbose", true ); cfg.sync(); } TQStringList minicliFilters; - minicliFilters << "kshorturifilter" << "kurisearchfilter" << "localdomainurifilter"; + minicliFilters << "tdeshorturifilter" << "kurisearchfilter" << "localdomainurifilter"; // URI that should require no filtering filter( "http://www.kde.org", "http://www.kde.org", KURIFilterData::NET_PROTOCOL ); @@ -213,8 +213,8 @@ int main(int argc, char **argv) filter( "ftp://username@ftp.kde.org:500", "ftp://username@ftp.kde.org:500", KURIFilterData::NET_PROTOCOL ); // ShortURI/LocalDomain filter tests. NOTE: any of these tests can fail - // if you have specified your own patterns in kshorturifilterrc. For - // examples, see $TDEDIR/share/config/kshorturifilterrc . + // if you have specified your own patterns in tdeshorturifilterrc. For + // examples, see $TDEDIR/share/config/tdeshorturifilterrc . filter( "linuxtoday.com", "http://linuxtoday.com", KURIFilterData::NET_PROTOCOL ); filter( "LINUXTODAY.COM", "http://linuxtoday.com", KURIFilterData::NET_PROTOCOL ); filter( "kde.org", "http://kde.org", KURIFilterData::NET_PROTOCOL ); @@ -240,10 +240,10 @@ int main(int argc, char **argv) // filter( "localhost/~blah", "http://localhost.localdomain/~blah", KURIFilterData::NET_PROTOCOL ); filter( "/", "/", KURIFilterData::LOCAL_DIR ); - filter( "/", "/", KURIFilterData::LOCAL_DIR, "kshorturifilter" ); - filter( "~/.bashrc", TQDir::homeDirPath().local8Bit()+"/.bashrc", KURIFilterData::LOCAL_FILE, "kshorturifilter" ); - filter( "~", TQDir::homeDirPath().local8Bit(), KURIFilterData::LOCAL_DIR, "kshorturifilter", "/tmp" ); - filter( "~foobar", 0, KURIFilterData::ERROR, "kshorturifilter" ); + filter( "/", "/", KURIFilterData::LOCAL_DIR, "tdeshorturifilter" ); + filter( "~/.bashrc", TQDir::homeDirPath().local8Bit()+"/.bashrc", KURIFilterData::LOCAL_FILE, "tdeshorturifilter" ); + filter( "~", TQDir::homeDirPath().local8Bit(), KURIFilterData::LOCAL_DIR, "tdeshorturifilter", "/tmp" ); + filter( "~foobar", 0, KURIFilterData::ERROR, "tdeshorturifilter" ); filter( "user@host.domain", "mailto:user@host.domain", KURIFilterData::NET_PROTOCOL ); // new in KDE-3.2 // Windows style SMB (UNC) URL. Should be converted into the valid smb format... @@ -333,8 +333,8 @@ int main(int argc, char **argv) // the shortURI filter will return the string // itself if the requested environment variable // is not already set. - filter( "$QTDIR", 0, KURIFilterData::LOCAL_DIR, "kshorturifilter" ); //use specific filter. - filter( "$HOME", home, KURIFilterData::LOCAL_DIR, "kshorturifilter" ); //use specific filter. + filter( "$QTDIR", 0, KURIFilterData::LOCAL_DIR, "tdeshorturifilter" ); //use specific filter. + filter( "$HOME", home, KURIFilterData::LOCAL_DIR, "tdeshorturifilter" ); //use specific filter. TQCString sc; @@ -348,10 +348,10 @@ int main(int argc, char **argv) filter( sc.sprintf("gg%cé", delimiter) /*eaccent in utf8*/, "http://www.google.com/search?q=%C3%A9&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL ); filter( sc.sprintf("gg%cпрйвет", delimiter) /* greetings in russian utf-8*/, "http://www.google.com/search?q=%D0%BF%D1%80%D0%B9%D0%B2%D0%B5%D1%82&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL ); - // Absolute Path tests for kshorturifilter - filter( "./", tdehome+"/share", KURIFilterData::LOCAL_DIR, "kshorturifilter", tdehome+"/share/" ); // cleanDirPath removes the trailing slash - filter( "../", tdehome, KURIFilterData::LOCAL_DIR, "kshorturifilter", tdehome+"/share" ); - filter( "config", tdehome+"/share/config", KURIFilterData::LOCAL_DIR, "kshorturifilter", tdehome+"/share" ); + // Absolute Path tests for tdeshorturifilter + filter( "./", tdehome+"/share", KURIFilterData::LOCAL_DIR, "tdeshorturifilter", tdehome+"/share/" ); // cleanDirPath removes the trailing slash + filter( "../", tdehome, KURIFilterData::LOCAL_DIR, "tdeshorturifilter", tdehome+"/share" ); + filter( "config", tdehome+"/share/config", KURIFilterData::LOCAL_DIR, "tdeshorturifilter", tdehome+"/share" ); // Clean up TDEIO::NetAccess::del( tdehome, 0 ); diff --git a/tdeio/tests/tdeioslavetest.h b/tdeio/tests/tdeioslavetest.h index 667cb2856..04992f889 100644 --- a/tdeio/tests/tdeioslavetest.h +++ b/tdeio/tests/tdeioslavetest.h @@ -19,7 +19,7 @@ #include #include -#include +#include #include "tdeio/job.h" #include "tdeio/global.h" -- cgit v1.2.3