Rename many classes and header files to avoid conflicts with KDE4

feat/lzip-support
Timothy Pearson 12 years ago
parent 41fe626241
commit 86651d6d98

@ -182,7 +182,7 @@ http://groups.google.com/group/krusader-devel/browse_thread/thread/d102adec2edcf
<!ENTITY xfce-url '<ulink url="http://www.xfce.org/"><application>XFce</application></ulink>'>
<!ENTITY debian-qt-a-url '<ulink url="http://www.krusader.org/phpBB/viewtopic.php?t=710">in our forum</ulink>'>
<!ENTITY debian-qt-b-url '<ulink url="http://opendoorsoftware.com/cgi/http.pl?p=DebianQTChecklist">instructions</ulink>'>
<!ENTITY debian-qt-b-url '<ulink url="http://opendoorsoftware.com/cgi/http.pl?p=DebianQTChectdelist">instructions</ulink>'>
<!ENTITY freenode-url '<ulink url="http://freenode.net">freenode.org</ulink>'>
<!ENTITY fink-url '<ulink url="http://www.finkproject.org/">fink</ulink>'>
<!ENTITY kjsembed-url '<ulink url="http://xmelegance.org/kjsembed/">KJSEmbed</ulink>'>

@ -281,7 +281,7 @@
</listitem>
<listitem>
<para>&popup-panel-lnk;: has several display
modes: Preview, Tree, Quickselect, View and Disk Usage for
modes: Preview, Tree, Quictdeselect, View and Disk Usage for
the file or directory that has the focus. The PopUp Panel
may be left open or closed, as desired.</para>
</listitem>
@ -520,7 +520,7 @@
<listitem>
<para>
<emphasis>
<guilabel>Quickselect Panel</guilabel>
<guilabel>Quictdeselect Panel</guilabel>
</emphasis>: is used to quickly select files,
&eg;
<literal role="extension">*.png</literal>and click on the

@ -396,7 +396,7 @@ since the Entity Backspace is not defined in
<!ENTITY debian_qt_a_url '<ulink url="http://www.krusader.org/phpBB/viewtopic.php?t=710"
>in our forum</ulink
>'>
<!ENTITY debian_qt_b_url '<ulink url="http://opendoorsoftware.com/cgi/http.pl?p=DebianQTChecklist"
<!ENTITY debian_qt_b_url '<ulink url="http://opendoorsoftware.com/cgi/http.pl?p=DebianQTChectdelist"
>instructions</ulink
>'>
<!ENTITY freenode_url '<ulink url="http://freenode.net"

@ -25,7 +25,7 @@
#include <kkeybutton.h>
#include <tqcheckbox.h>
#include <tqgroupbox.h>
#include <klistbox.h>
#include <tdelistbox.h>
#include <tqlayout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@ -34,7 +34,7 @@
#include "kicondialog.h"
#include "ktextedit.h"
#include "kkeybutton.h"
#include "klistbox.h"
#include "tdelistbox.h"
/*
* Constructs a ActionPropertyBase as a child of 'parent', with the

@ -1116,10 +1116,10 @@ Please consult the handbook to learn more about the syntax.</string>
<includehint>klineedit.h</includehint>
<includehint>ktextedit.h</includehint>
<includehint>kkeybutton.h</includehint>
<includehint>klistbox.h</includehint>
<includehint>klistbox.h</includehint>
<includehint>klistbox.h</includehint>
<includehint>klistbox.h</includehint>
<includehint>tdelistbox.h</includehint>
<includehint>tdelistbox.h</includehint>
<includehint>tdelistbox.h</includehint>
<includehint>tdelistbox.h</includehint>
<includehint>klineedit.h</includehint>
</includehints>
</UI>

@ -13,7 +13,7 @@
#ifndef ADDPLACEHOLDERPOPUP_H
#define ADDPLACEHOLDERPOPUP_H
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kdialogbase.h>
#include "../UserAction/expander.h"

@ -12,7 +12,7 @@
#ifndef USERACTIONLISTVIEW_H
#define USERACTIONLISTVIEW_H
#include <klistview.h>
#include <tdelistview.h>
class KrAction;
class TQString;

@ -7,7 +7,7 @@
#include <kurl.h>
#include <klineedit.h>
#include <tqmap.h>
#include <klistview.h>
#include <tdelistview.h>
#include <tqtoolbutton.h>
class KrAddBookmarkDlg: public KDialogBase {

@ -1,7 +1,7 @@
#include "krbookmark.h"
#include "../krusader.h"
#include "../VFS/krarchandler.h"
#include <kactioncollection.h>
#include <tdeactioncollection.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kdebug.h>

@ -1,7 +1,7 @@
#ifndef KRBOOKMARK_H
#define KRBOOKMARK_H
#include <kaction.h>
#include <tdeaction.h>
#include <tqptrlist.h>
#include <kurl.h>

@ -3,9 +3,9 @@
#include "../krusader.h"
#include <tqpixmap.h>
#include <kiconloader.h>
#include <kaction.h>
#include <tdeaction.h>
#include <klocale.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kdebug.h>
KrBookmarkButton::KrBookmarkButton(TQWidget *parent): TQToolButton(parent) {

@ -7,7 +7,7 @@
#include <kiconloader.h>
#include <kmessagebox.h>
#include <tqptrlist.h>
#include <kactioncollection.h>
#include <tdeactioncollection.h>
#include <klocale.h>
#include <kdebug.h>
#include <kbookmarkmanager.h>

@ -4,7 +4,7 @@
#include "krbookmark.h"
#include <tqobject.h>
#include <tqguardedptr.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kurl.h>
#include <tqptrdict.h>
#include <tqvaluelist.h>

@ -5,7 +5,7 @@
#include <tqlabel.h>
#include <tqcheckbox.h>
#include <klineedit.h>
#include <klistview.h>
#include <tdelistview.h>
#include <tqpixmap.h>
#include <kcursor.h>
#include <kmessagebox.h>

@ -47,7 +47,7 @@
#include <kstandarddirs.h>
#include <tdeversion.h>
#include <tqcheckbox.h>
#include <krecentdocument.h>
#include <tderecentdocument.h>
#include <tqhbox.h>
// Krusader includes
#include "../krusader.h"

@ -20,7 +20,7 @@
#include <kglobal.h>
#include <kstandarddirs.h>
#include <tdeconfig.h>
#include <kactionshortcutlist.h>
#include <tdeactionshortcutlist.h>
#include <kdebug.h>
#include "../krusader.h"

@ -34,7 +34,7 @@
#include <tqcursor.h>
#include <tqlayout.h>
#include <tdefiledialog.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kmessagebox.h>

@ -1,13 +1,13 @@
#include <kmessagebox.h>
#include <klocale.h>
#include <tqpushbutton.h>
#include <klistview.h>
#include <tdelistview.h>
#include <kiconloader.h>
#include <klistviewsearchline.h>
#include <tdelistviewsearchline.h>
#include <tqheader.h>
#include <tqlayout.h>
#include <tqlabel.h>
#include <ktoolbarbutton.h>
#include <tdetoolbarbutton.h>
#include "../krusader.h"
#include "../krslots.h"
#include "popularurls.h"

@ -31,7 +31,7 @@
#include <time.h>
#include <tqlayout.h>
#include <klocale.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kmimetype.h>
#include <kmessagebox.h>
#include <kglobalsettings.h>

@ -30,7 +30,7 @@
#include "dufilelight.h"
#include "radialMap/radialMap.h"
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <klocale.h>
#include <kinputdialog.h>

@ -39,7 +39,7 @@
#include <tqfontmetrics.h>
#include <tqtimer.h>
#include <tqtooltip.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
class DULinesItem : public TQListViewItem
{

@ -11,7 +11,7 @@
#include <tdeio/job.h> //::mousePressEvent()
#include <klocale.h>
#include <kmessagebox.h> //::mousePressEvent()
#include <kpopupmenu.h> //::mousePressEvent()
#include <tdepopupmenu.h> //::mousePressEvent()
#include <krun.h> //::mousePressEvent()
#include <math.h> //::segmentAt()
#include <tqapplication.h>//TQApplication::setOverrideCursor()

@ -25,10 +25,10 @@
#include "../krusader.h"
#include "../krusaderview.h"
#include <kactionclasses.h>
#include <tdeactionclasses.h>
#include <klocale.h>
#include <kiconloader.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kdebug.h>

@ -29,7 +29,7 @@
* *
***************************************************************************/
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kcharsets.h>
#include <tdeio/slaveconfig.h>
#include <dcopclient.h>

@ -35,7 +35,7 @@
#include <tqstringlist.h>
#include <kurl.h>
#include <klibloader.h>
#include <kaction.h>
#include <tdeaction.h>
class KrRemoteEncodingMenu: public TDEActionMenu
{

@ -33,7 +33,7 @@
#include <klocale.h>
#include <tqtooltip.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <tqcursor.h>
#include <kinputdialog.h>
#include <kiconloader.h>

@ -44,7 +44,7 @@
#include <tqlineedit.h>
#include <kurlrequester.h>
#include <tqhbox.h>
#include <kfontdialog.h>
#include <tdefontdialog.h>
#include <tqlabel.h>
#include <tqfont.h>
#include <tqtoolbutton.h>

@ -45,7 +45,7 @@
#include <tqlayout.h>
#include <tqfontmetrics.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <tqcursor.h>
#include <tqeventloop.h>
#include <kfinddialog.h>

@ -33,7 +33,7 @@
#include <kdialogbase.h>
#include <kcombobox.h>
#include <klistview.h>
#include <tdelistview.h>
#include <kprocess.h>
#include <tqcheckbox.h>

@ -34,7 +34,7 @@ YP YD 88 YD ~Y8888P' `8888Y' YP YP Y8888D' Y88888P 88 YD
#include <kmessagebox.h>
#include <kprocess.h>
#include <klocale.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kdebug.h>
// Krusader includes

@ -39,7 +39,7 @@ A
#include "../VFS/vfs.h"
#include <klocale.h>
#include <tqpixmap.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <tqbitmap.h>
#include <kmessagebox.h>
#include <tqlayout.h>

@ -51,7 +51,7 @@ YP YD 88 YD ~Y8888P' `8888Y' YP YP Y8888D' Y88888P 88 YD
#include <kinputdialog.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <tqdict.h>
//////////////////////////////////////////////////////////////////////////
@ -1390,7 +1390,7 @@ void KrDetailedView::makeItemVisible( const KrViewItem *item ) {
void KrDetailedView::initOperator() {
_operator = new KrViewOperator(this, this);
// klistview emits selection changed, so chain them to operator
// tdelistview emits selection changed, so chain them to operator
connect(this, TQT_SIGNAL(selectionChanged()), _operator, TQT_SIGNAL(selectionChanged()));
}

@ -30,7 +30,7 @@ A
#ifndef KRDETAILEDVIEW_H
#define KRDETAILEDVIEW_H
#include <klistview.h>
#include <tdelistview.h>
#include <ksqueezedtextlabel.h>
#include <klocale.h>
#include <tqwidget.h>

@ -34,7 +34,7 @@
#include "krviewitem.h"
#include <sys/types.h>
#include "../VFS/vfile.h"
#include <klistview.h>
#include <tdelistview.h>
#include <tqguardedptr.h>
#define FASTER

@ -1,7 +1,7 @@
#ifndef KRPOPUPMENU_H
#define KRPOPUPMENU_H
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kurl.h>
#include <kuserprofile.h>
#include "listpanel.h"

@ -69,8 +69,8 @@ public:
};
// operator can handle two ways of doing things:
// 1. if the view is a widget (inherits krview and klistview for example)
// 2. if the view HAS A widget (a krview-son has a member of klistview)
// 1. if the view is a widget (inherits krview and tdelistview for example)
// 2. if the view HAS A widget (a krview-son has a member of tdelistview)
// this is done by specifying the view and the widget in the constructor,
// even if they are actually the same object (specify it twice in that case)
class KrViewOperator: public TQObject {

@ -41,7 +41,7 @@ YP YD 88 YD ~Y8888P' `8888Y' YP YP Y8888D' Y88888P 88 YD
#include <tqregexp.h>
#include <tqsplitter.h>
// KDE includes
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kprocess.h>
#include <kmessagebox.h>
#include <klocale.h>

@ -45,7 +45,7 @@
#include <tqregexp.h>
#include <tqfontmetrics.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <tqcursor.h>
#include <tqclipboard.h>
#include <tqheader.h>

@ -44,7 +44,7 @@
#include <kurlrequester.h>
#include <klocale.h>
#include <tqgrid.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <tqcursor.h>
#include <time.h>
#include <kmessagebox.h>

@ -22,7 +22,7 @@
#include <tqcheckbox.h>
#include <tqfile.h>
#include <tqlabel.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kurl.h>
#include <kmessagebox.h>
#include <tdefiledialog.h>

@ -13,7 +13,7 @@
#ifndef KRACTION_H
#define KRACTION_H
#include <kaction.h>
#include <tdeaction.h>
#include <kprocess.h>
#include <kdialogbase.h>
#include "kractionbase.h"

@ -12,7 +12,7 @@
#include <kdebug.h>
#include <kurl.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kstandarddirs.h>
#include <kmessagebox.h>

@ -13,7 +13,7 @@
#ifndef USERACTIONPOPUPMENU_H
#define USERACTIONPOPUPMENU_H
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
class KURL;

@ -18,7 +18,7 @@ email :
#ifndef USERMENU_H
#define USERMENU_H
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
class TQWidget;
class UserMenu;

@ -36,7 +36,7 @@ YP YD 88 YD ~Y8888P' `8888Y' YP YP Y8888D' Y88888P 88 YD
#endif
// KDE includes
#include <kmessagebox.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kcursor.h>
#include <ksystemtray.h>
#include <kmenubar.h>
@ -44,11 +44,11 @@ YP YD 88 YD ~Y8888P' `8888Y' YP YP Y8888D' Y88888P 88 YD
#include <kcmdlineargs.h>
#include <kglobal.h>
#include <klocale.h>
#include <kaccelmanager.h>
#include <tdeaccelmanager.h>
#include <twin.h>
#if KDE_IS_VERSION(3,2,0)
#include <kactionclasses.h>
#include <tdeactionclasses.h>
#endif
#include <tdeversion.h>

@ -41,9 +41,9 @@
#include <kapplication.h>
#include <tdeparts/mainwindow.h>
#include <kstdaction.h>
#include <kaction.h>
#include <tdeaction.h>
#include <tdeconfig.h>
#include <kaccel.h>
#include <tdeaccel.h>
#include <tqstringlist.h>
#include <tqtextstream.h>
#include <kdebug.h>

@ -32,7 +32,7 @@
#include <tqwhatsthis.h>
#include <kstatusbar.h>
#include <kmenubar.h>
#include <kshortcut.h>
#include <tdeshortcut.h>
// Krusader includes
#include "krusaderview.h"
#include "krusader.h"

@ -33,9 +33,9 @@
#define KRUSADERVIEW_H
// KDE includes
#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <kaccel.h>
#include <tdeaccel.h>
#include <kapplication.h>
#include <tdeparts/part.h>

@ -20,9 +20,9 @@
#include "krusaderview.h"
#include "krslots.h"
#include "defaults.h"
#include <kaction.h>
#include <tdeaction.h>
#include <klocale.h>
#include <kshortcut.h>
#include <tdeshortcut.h>
#include <tqevent.h>
#include <tqwidgetstack.h>
#include <tqfontmetrics.h>

@ -5615,19 +5615,19 @@ msgstr "Definierade länkar"
#: Konfigurator/kgprotocols.cpp:85
msgid "Add protocol to the link list."
msgstr "Lägg till protokoll till länklistan."
msgstr "Lägg till protokoll till läntdelistan."
#: Konfigurator/kgprotocols.cpp:88
msgid "Remove protocol from the link list."
msgstr "Tag bort protokoll från länklistan."
msgstr "Tag bort protokoll från läntdelistan."
#: Konfigurator/kgprotocols.cpp:98
msgid "Add mime to the selected protocol on the link list."
msgstr "Lägg till mime till det valda protokollet i länklistan."
msgstr "Lägg till mime till det valda protokollet i läntdelistan."
#: Konfigurator/kgprotocols.cpp:101
msgid "Remove mime from the link list."
msgstr "Tag bort mime från länklistan."
msgstr "Tag bort mime från läntdelistan."
#: Konfigurator/kgprotocols.cpp:119
msgid "Mimes"

Loading…
Cancel
Save