TDE
/
tdebindings
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebindings
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename additional header files to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent ccbad20c6d
commit 5ac308306a
43 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File

2
dcoppython/test/dcopserver/kdedcoptest.cpp
Unescape View File

@ -7,7 +7,7 @@
#include <tqlabel.h>
#include <tdemainwindow.h>
#include <klocale.h>
#include <tdelocale.h>
KDEDcopTest::KDEDcopTest()
: TDEMainWindow( 0, "KDEDcopTest" )

2
dcoppython/test/dcopserver/main.cpp
Unescape View File

@ -6,7 +6,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
#include <klocale.h>
#include <tdelocale.h>
static const char *description =
I18N_NOOP("A TDE KPart Application");

8
kalyptus/kalyptusCxxToJNI.pm
Unescape View File

@ -3355,7 +3355,7 @@ sub addIncludeForClass($$$)
{
my ( $node, $addInclude, $debugMe ) = @_;
my $sourcename = $node->{Source}->{astNodeName};
if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|tdeabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
$sourcename =~ s!.*/(.*)!$1!m;
}
# die "Empty source name for $node->{astNodeName}" if ( $sourcename eq '' );
@ -3624,7 +3624,7 @@ sub generateMethod($$$$$$$$$)
return;
}
if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|tdeabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
$sourcename =~ s!.*/(.*)!$1!m;
}
if ( $sourcename eq '' ) {
@ -4155,7 +4155,7 @@ sub generateAllMethods($$$$$$$$)
my $sourcename = $classNode->{Source}->{astNodeName};
if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|tdeabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
$sourcename =~ s!.*/(.*)!$1!m;
}
# die "Empty source name for $classNode->{astNodeName} $classNode->{Source}->{astNodeName}" if ( $sourcename eq '' );
@ -4164,7 +4164,7 @@ sub generateAllMethods($$$$$$$$)
$addInclude->{$sourcename} = 1;
# my $s;
# for my $sn( @{$classNode->{Sources}} ) {
# if ( ($s = $sn->{astNodeName}) !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
# if ( ($s = $sn->{astNodeName}) !~ s!.*(tdeio/|tdeparts/|dom/|tdeabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
# $s =~ s!.*/(.*)!$1!m;
# }
# $addInclude->{$s} = 1;

6
kalyptus/kalyptusCxxToJava.pm
Unescape View File

@ -1732,7 +1732,7 @@ sub generateMethod($$$$$$$)
return;
}
if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|tdeabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
$sourcename =~ s!.*/(.*)!$1!m;
}
if ( $sourcename eq '' ) {
@ -2124,7 +2124,7 @@ sub generateAllMethods($$$$$$)
my $sourcename = $classNode->{Source}->{astNodeName};
if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|tdeabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
$sourcename =~ s!.*/(.*)!$1!m;
}
die "Empty source name for $classNode->{astNodeName}" if ( $sourcename eq '' );
@ -2148,7 +2148,7 @@ sub generateAllMethods($$$$$$)
if ($classNode->{astNodeName} ne $main::globalSpaceClassName) {
# my $s;
# for my $sn( @{$classNode->{Sources}} ) {
# if ( ($s = $sn->{astNodeName}) !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
# if ( ($s = $sn->{astNodeName}) !~ s!.*(tdeio/|tdeparts/|dom/|tdeabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
# $s =~ s!.*/(.*)!$1!m;
# }
# $addInclude->{$s} = 1;

6
kalyptus/kalyptusCxxToKimono.pm
Unescape View File

@ -1777,7 +1777,7 @@ sub generateMethod($$$$$$$)
return;
}
if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|tdeabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
$sourcename =~ s!.*/(.*)!$1!m;
}
if ( $sourcename eq '' ) {
@ -2317,7 +2317,7 @@ sub generateAllMethods($$$$$$)
my $sourcename = $classNode->{Source}->{astNodeName};
if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|tdeabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
$sourcename =~ s!.*/(.*)!$1!m;
}
die "Empty source name for $classNode->{astNodeName}" if ( $sourcename eq '' );
@ -2339,7 +2339,7 @@ sub generateAllMethods($$$$$$)
if ($classNode->{astNodeName} ne $main::globalSpaceClassName) {
# my $s;
# for my $sn( @{$classNode->{Sources}} ) {
# if ( ($s = $sn->{astNodeName}) !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
# if ( ($s = $sn->{astNodeName}) !~ s!.*(tdeio/|tdeparts/|dom/|tdeabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
# $s =~ s!.*/(.*)!$1!m;
# }
# $addInclude->{$s} = 1;

2
kalyptus/kalyptusCxxToSmoke.pm
Unescape View File

@ -230,7 +230,7 @@ BEGIN
'TQStyle::SubControls' => 'int',
);
$headerSubdirectories = "tdeio/|tdevelop/|kinterfacedesigner/|kontact/|kate/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/|knewstuff/"
$headerSubdirectories = "tdeio/|tdevelop/|kinterfacedesigner/|kontact/|kate/|tdeparts/|dom/|tdeabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/|knewstuff/"
}

2
kdejava/koala/kdejava/KComboBox.cpp
Unescape View File

@ -1,5 +1,5 @@
//Auto-generated by kalyptus. DO NOT EDIT.
#include <kglobalsettings.h>
#include <tdeglobalsettings.h>
#include <kcombobox.h>
#include <kcompletion.h>
#include <tqstring.h>

4
kdejava/koala/kdejava/KDE.cpp
Unescape View File

@ -20,12 +20,12 @@
#include <tqiconset.h>
#include <tdeversion.h>
#include <kicontheme.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kdrawutil.h>
#include <tqstring.h>
#include <kprotocolinfo.h>
#include <ksslutils.h>
#include <kglobal.h>
#include <tdeglobal.h>
#include <kiconloader.h>
#include <kprinter.h>
#include <kurl.h>

2
kdejava/koala/kdejava/KDEJavaSlot.h
Unescape View File

@ -32,7 +32,7 @@
#include <kdockwidget.h>
#include <kdualcolorbtn.h>
#include <tdefileview.h>
#include <kglobalsettings.h>
#include <tdeglobalsettings.h>
#include <tdelistview.h>
#include <kprocio.h>
#include <kprocess.h>

2
kdejava/koala/kdejava/KDirOperator.cpp
Unescape View File

@ -1,5 +1,5 @@
//Auto-generated by kalyptus. DO NOT EDIT.
#include <kdiroperator.h>
#include <tdediroperator.h>
#include <tqdir.h>
#include <tdeparts/browserextension.h>
#include <tdeaction.h>

2
kdejava/koala/kdejava/KEMailSettings.cpp
Unescape View File

@ -1,5 +1,5 @@
//Auto-generated by kalyptus. DO NOT EDIT.
#include <kemailsettings.h>
#include <tdeemailsettings.h>
#include <tqstring.h>
#include <tqstringlist.h>

2
kdejava/koala/kdejava/KLineEdit.cpp
Unescape View File

@ -1,5 +1,5 @@
//Auto-generated by kalyptus. DO NOT EDIT.
#include <kglobalsettings.h>
#include <tdeglobalsettings.h>
#include <klineedit.h>
#include <kcompletion.h>
#include <tqstring.h>

2
kdejava/koala/kdejava/KMenuBar.cpp
Unescape View File

@ -1,7 +1,7 @@
//Auto-generated by kalyptus. DO NOT EDIT.
#include <tqsize.h>
#include <tqrect.h>
#include <kmenubar.h>
#include <tdemenubar.h>
#include <qtjava/QtSupport.h>
#include <kdejava/KDESupport.h>

2
kdejava/koala/kdejava/KMessageBox.cpp
Unescape View File

@ -1,5 +1,5 @@
//Auto-generated by kalyptus. DO NOT EDIT.
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <tqpixmap.h>
#include <tqmessagebox.h>
#include <tqstring.h>

2
kdejava/koala/kdejava/KProtocolManager.cpp
Unescape View File

@ -1,5 +1,5 @@
//Auto-generated by kalyptus. DO NOT EDIT.
#include <kprotocolmanager.h>
#include <tdeprotocolmanager.h>
#include <tdeio/global.h>
#include <tqstring.h>
#include <kurl.h>

2
kdejava/koala/kdejava/KTempFile.cpp
Unescape View File

@ -1,6 +1,6 @@
//Auto-generated by kalyptus. DO NOT EDIT.
#include <tqstring.h>
#include <ktempfile.h>
#include <tdetempfile.h>
#include <qtjava/QtSupport.h>
#include <kdejava/KDESupport.h>

2
kdejava/koala/kdejava/TDECompletion.cpp
Unescape View File

@ -1,5 +1,5 @@
//Auto-generated by kalyptus. DO NOT EDIT.
#include <kglobalsettings.h>
#include <tdeglobalsettings.h>
#include <kcompletion.h>
#include <tqstring.h>
#include <tqstringlist.h>

2
kdejava/koala/kdejava/TDECompletionBase.cpp
Unescape View File

@ -1,5 +1,5 @@
//Auto-generated by kalyptus. DO NOT EDIT.
#include <kglobalsettings.h>
#include <tdeglobalsettings.h>
#include <kcompletion.h>
#include <tqstring.h>
#include <tqstringlist.h>

2
kdejava/koala/kdejava/TDEGlobal.cpp
Unescape View File

@ -1,6 +1,6 @@
//Auto-generated by kalyptus. DO NOT EDIT.
#include <tqstring.h>
#include <kglobal.h>
#include <tdeglobal.h>
#include <qtjava/QtSupport.h>
#include <kdejava/KDESupport.h>

2
kdejava/koala/kdejava/TDEGlobalSettings.cpp
Unescape View File

@ -1,5 +1,5 @@
//Auto-generated by kalyptus. DO NOT EDIT.
#include <kglobalsettings.h>
#include <tdeglobalsettings.h>
#include <tqrect.h>
#include <tqfont.h>
#include <tqstring.h>

2
kdejava/koala/kdejava/TDELocale.cpp
Unescape View File

@ -1,6 +1,6 @@
//Auto-generated by kalyptus. DO NOT EDIT.
#include <tqdatetime.h>
#include <klocale.h>
#include <tdelocale.h>
#include <tqstring.h>
#include <tqstringlist.h>

2
kdejava/koala/org/kde/koala/KHelpMenu.java
Unescape View File

@ -18,7 +18,7 @@ import org.kde.qt.TQObject;
The usage is simple:
<pre>
mHelpMenu = new KHelpMenu( this, <someText> );
kmenubar.insertItem(i18n("&Help"), mHelpMenu.menu() );
tdemenubar.insertItem(i18n("&Help"), mHelpMenu.menu() );
</pre>
or if you just want to open a dialog box:
<pre>

2
kjsembed/bindings/netaccess_imp.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <kurl.h>
#include <kdebug.h>
#include <tdeversion.h>
#include <ktempfile.h>
#include <tdetempfile.h>
namespace KJSEmbed {
namespace Bindings {

2
kjsembed/builtins/qdir_imp.cpp
Unescape View File

@ -6,7 +6,7 @@
#include <kjs/object.h>
#ifndef QT_ONLY
#include <klocale.h>
#include <tdelocale.h>
#include <kdebug.h>
#endif

2
kjsembed/builtins/qfile_imp.cpp
Unescape View File

@ -6,7 +6,7 @@
#include <tqfont.h>
#ifndef QT_ONLY
#include <klocale.h>
#include <tdelocale.h>
#include <kdebug.h>
#endif

2
kjsembed/builtins/resources.cpp
Unescape View File

@ -19,7 +19,7 @@
#include <kstandarddirs.h>
#include <kiconloader.h>
#include <kglobal.h>
#include <tdeglobal.h>
#include <kdebug.h>
#include <jsproxy.h>
#include <jsbinding.h>

2
kjsembed/cpptests/jsaccess/jsaccess.cpp
Unescape View File

@ -22,7 +22,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kjs/interpreter.h>
#include <kjsembed/jsconsolewidget.h>

2
kjsembed/customobject_imp.cpp
Unescape View File

@ -51,7 +51,7 @@
#include <tdelistview.h>
#include <kurl.h>
#include <tdemainwindow.h>
#include <kmenubar.h>
#include <tdemenubar.h>
#include <kstatusbar.h>
#include <ksystemtray.h>
#include <tdepopupmenu.h>

2
kjsembed/docs/embedding/simple-embed/main.cpp
Unescape View File

@ -22,7 +22,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
#include <klocale.h>
#include <tdelocale.h>
static const char description[] =
I18N_NOOP("A TDE Application");

2
kjsembed/global.h
Unescape View File

@ -67,7 +67,7 @@ KJSEMBED_EXPORT TQTextStream *conerr();
*/
#include <kdebug.h>
#include <klocale.h>
#include <tdelocale.h>
#else // QT_ONLY

4
kjsembed/jsbuiltin_imp.cpp
Unescape View File

@ -27,9 +27,9 @@
#ifndef QT_ONLY
#include "global.h"
#include <klocale.h>
#include <tdelocale.h>
#include <kinputdialog.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <kstddirs.h>
#include "ksimpleprocess.h"

4
kjsembed/jsconsolewidget.cpp
Unescape View File

@ -25,10 +25,10 @@
#include <kdebug.h>
#include <kdialog.h>
#include <kglobal.h>
#include <tdeglobal.h>
#include <kiconloader.h>
#include <klineedit.h>
#include <klocale.h>
#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <kprocess.h>
#include <ktextedit.h>

2
kjsembed/jsfactory.cpp
Unescape View File

@ -48,7 +48,7 @@
#include <dcopclient.h>
#include <tdeaction.h>
#include <klibloader.h>
#include <klocale.h>
#include <tdelocale.h>
#include <tdemainwindow.h>
#include <kservice.h>
#include <ksystemtray.h>

2
kjsembed/kjscmd.cpp
Unescape View File

@ -29,7 +29,7 @@
#include <tdecmdlineargs.h>
#include <kdebug.h>
#include <kimageio.h>
#include <klocale.h>
#include <tdelocale.h>
#include <tdemainwindow.h>
#include <kjs/interpreter.h>

2
kjsembed/ksimpleprocess.cpp
Unescape View File

@ -20,7 +20,7 @@
*/
#include "ksimpleprocess.h"
#include <tqapplication.h>
#include <klocale.h>
#include <tdelocale.h>
static TQStringList splitArgList( const TQString &args)
{
TQStringList returnArgs = TQStringList::split( ' ', args);

2
kjsembed/plugin/jsconsoleplugin.cpp
Unescape View File

@ -22,7 +22,7 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kinstance.h>
#include <klocale.h>
#include <tdelocale.h>
#include <tdeparts/part.h>
#include <jsfactory.h>

2
kjsembed/plugins/imagefx_plugin.cpp
Unescape View File

@ -20,7 +20,7 @@
*/
#include <kdebug.h>
#include <kglobal.h>
#include <tdeglobal.h>
#include <kjsembed/jsopaqueproxy.h>
#include <kjsembed/jsbinding.h>
#include <kjsembed/jsfactory.h>

2
kjsembed/testkjsembed.cpp
Unescape View File

@ -20,7 +20,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kjs/interpreter.h>
#include <jsconsolewidget.h>

2
kjsembed/tests/testkjsembed.cpp
Unescape View File

@ -20,7 +20,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kjs/interpreter.h>
#include <kjsembed/jsconsolewidget.h>

2
kjsembed/tools/doxygen2cons_cpp.xsl
Unescape View File

@ -5,7 +5,7 @@
<xsl:variable name="clazz" select="compoundname" />
<xsl:variable name="consmeth" select="sectiondef/memberdef[@kind='function' and @prot='public']" />
#include &lt;klocale.h>
#include &lt;tdelocale.h>
#include &lt;kjs/object.h>
#include &lt;<xsl:value-of select="includes" />>

2
kjsembed/tools/doxygen2imp_cpp.xsl
Unescape View File

@ -11,7 +11,7 @@
#include &lt;qpixmap.h>
#include &lt;qfont.h>
#include &lt;klocale.h>
#include &lt;tdelocale.h>
#include &lt;kjs/object.h>
#include &lt;kdebug.h>

4
korundum/rubylib/rbtdeconfig_compiler/rbtdeconfig_compiler.cpp
Unescape View File

@ -30,9 +30,9 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <kglobal.h>
#include <tdeglobal.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>

20
smoke/kde/kde_header_list
Unescape View File

@ -124,7 +124,7 @@ kdialog.h
kdirlister.h
kdirnotify.h
kdirnotify_stub.h
kdiroperator.h
tdediroperator.h
kdirselectdialog.h
kdirsize.h
kdirwatch.h
@ -137,7 +137,7 @@ kdualcolorbutton.h
keditcl.h
keditlistbox.h
kedittoolbar.h
kemailsettings.h
tdeemailsettings.h
kextendedsocket.h
kextsock.h
tdefiledetailview.h
@ -164,8 +164,8 @@ tdefontdialog.h
tdefontrequester.h
kgenericfactory.h
kglobalaccel.h
kglobal.h
kglobalsettings.h
tdeglobal.h
tdeglobalsettings.h
kguiitem.h
khelpmenu.h
tdehtmldefaults.h
@ -198,7 +198,7 @@ klineedit.h
tdelistbox.h
tdelistview.h
tdelistviewsearchline.h
klocale.h
tdelocale.h
kmacroexpander.h
tdemainwindow.h
tdemainwindowiface.h
@ -215,8 +215,8 @@ tdemdimainfrm.h
tdemdinulliterator.h
tdemditaskbar.h
tdemditoolviewaccessor.h
kmenubar.h
kmessagebox.h
tdemenubar.h
tdemessagebox.h
kmimemagic.h
kmimesourcefactory.h
kmimetype.h
@ -258,7 +258,7 @@ kprogress.h
kpropertiesdialog.h
kpropsdlg.h
kprotocolinfo.h
kprotocolmanager.h
tdeprotocolmanager.h
kpty.h
kpushbutton.h
krandomsequence.h
@ -322,7 +322,7 @@ ksslutils.h
ksslx509map.h
ksslx509v3.h
kstandarddirs.h
kstartupinfo.h
tdestartupinfo.h
kstaticdeleter.h
kstatusbar.h
tdestdaccel.h
@ -342,7 +342,7 @@ ktabctl.h
ktabwidget.h
ktar.h
ktempdir.h
ktempfile.h
tdetempfile.h
ktextbrowser.h
ktextedit.h
ktimewidget.h

Write Preview
Loading…
Cancel
Save