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

Fix a number of tdebindings build issues

Browse Source 
This partially resolves Bug 597
Thanks to Darrell Anderson for the patch!
pull/1/head
Timothy Pearson 13 years ago
parent c87286d815
commit b2e0df6cf5
12 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File

2
configure.in.in
Unescape View File

@ -302,4 +302,4 @@ dnl Check if knewstuff is present, if not don't bother..
KDE_CHECK_KNS KDE_CHECK_KNS
dnl remove when fixed dnl remove when fixed
DO_NOT_COMPILE="$DO_NOT_COMPILE dcopjava qtsharp" DO_NOT_COMPILE="$DO_NOT_COMPILE qtsharp"

4
dcopc/configure.in.in
Unescape View File

@ -1,7 +1,3 @@
dnl if test "$GTK_CONFIG" = "no"; then
DO_NOT_COMPILE="$DO_NOT_COMPILE dcopc"
dnl fi
dnl
dnl AC_CHECK_GETHOSTNAME dnl AC_CHECK_GETHOSTNAME
AC_GTK_2 AC_GTK_2

10
dcopperl/DCOP.xs
Unescape View File

@ -26,11 +26,11 @@
#undef vform #undef vform
#endif #endif
#include <qpoint.h> #include <tqpoint.h>
#include <qrect.h> #include <tqrect.h>
#include <qregexp.h> #include <tqregexp.h>
#include <qsize.h> #include <tqsize.h>
#include <qstringlist.h> #include <tqstringlist.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <dcopref.h> #include <dcopref.h>

24
dcopperl/Makefile.PL
Unescape View File

@ -4,30 +4,30 @@ use Config;
# the contents of the Makefile that is written. # the contents of the Makefile that is written.
print "Trying to find some configuration information...\n"; print "Trying to find some configuration information...\n";
my $kde_dirs = $ENV{TDEDIRS} || '/usr/local/kde'; my $tde_dirs = $ENV{TDEDIRS} || '/opt/trinity';
my $qt_dir = $ENV{QTDIR} || '/usr/lib/qt'; my $qt_dir = $ENV{QTDIR} || '/opt/trinity/lib';
my $kde_inc = "$kde_dirs/include"; my $tde_inc = "$tde_dirs/include";
my $kde_lib = "$kde_dirs/lib"; my $tde_lib = "$tde_dirs/lib";
my $qt_inc = "$qt_dir/include"; my $qt_inc = "$qt_dir/include";
my $qt_lib = "$qt_dir/lib"; my $qt_lib = "$qt_dir/lib";
$kde_inc = undef unless -f "$kde_inc/dcopclient.h"; $tde_inc = undef unless -f "$tde_inc/dcopclient.h";
$kde_lib = undef unless -f "$kde_lib/libDCOP.$Config{dlext}"; $tde_lib = undef unless -f "$tde_lib/libDCOP.$Config{dlext}";
$qt_dir = undef unless -f "$qt_inc/qglobal.h"; $qt_dir = undef unless -f "$qt_inc/qglobal.h";
print "Path to Qt headers? [$qt_inc]: "; print "Path to Qt headers? [$qt_inc]: ";
chomp $input, $qt_inc = $input if (($input = <>) =~ /\S/); chomp $input, $qt_inc = $input if (($input = <>) =~ /\S/);
print "Path to Qt libraries? [$qt_lib]: "; print "Path to Qt libraries? [$qt_lib]: ";
chomp $input, $qt_lib = $input if (($input = <>) =~ /\S/); chomp $input, $qt_lib = $input if (($input = <>) =~ /\S/);
print "Path to KDE headers? [$kde_inc]: "; print "Path to TDE headers? [$tde_inc]: ";
chomp $input, $kde_inc = $input if (($input = <>) =~ /\S/); chomp $input, $tde_inc = $input if (($input = <>) =~ /\S/);
print "Path to KDE libraries? [$kde_lib]: "; print "Path to TDE libraries? [$tde_lib]: ";
chomp $input, $kde_lib = $input if (($input = <>) =~ /\S/); chomp $input, $tde_lib = $input if (($input = <>) =~ /\S/);
WriteMakefile( WriteMakefile(
NAME => 'DCOP', NAME => 'DCOP',
VERSION_FROM => 'DCOP.pm', VERSION_FROM => 'DCOP.pm',
INC => "-I$qt_inc -I$kde_inc", INC => "-I$qt_inc -I$tde_inc -I/usr/include/tqt",
LIBS => "-L$qt_lib -ltqt-mt -L$kde_lib -ltdecore -lDCOP", LIBS => "-L$qt_lib -ltqt-mt -L$tde_lib -ltdecore -lDCOP",
XS => {'DCOP.xs' => 'DCOP.cpp'}, XS => {'DCOP.xs' => 'DCOP.cpp'},
XSOPT => '-C++', XSOPT => '-C++',
CCFLAGS => '-x c++', CCFLAGS => '-x c++',

10
dcopperl/Makefile.PL.in
Unescape View File

@ -4,16 +4,16 @@ use Config;
# the contents of the Makefile that is written. # the contents of the Makefile that is written.
print "Trying to find some configuration information...\n"; print "Trying to find some configuration information...\n";
my $kde_inc = "@kde_includes@"; my $tde_inc = "@tde_includes@";
my $kde_lib = "@kde_libraries@"; my $tde_lib = "@tde_libraries@";
my $qt_inc = "@qt_includes@"; my $qt_inc = "@qt_includes@";
my $qt_lib = "@qt_libraries@"; my $qt_lib = "@qt_libraries@";
WriteMakefile( WriteMakefile(
NAME => 'DCOP', NAME => 'DCOP',
VERSION_FROM => '@srcdir@/DCOP.pm', VERSION_FROM => '@srcdir@/DCOP.pm',
INC => "-I$qt_inc -I$kde_inc", INC => "-I$qt_inc -I$tde_inc -I/usr/include/tqt",
LIBS => "-L$qt_lib -ltqt-mt -L$kde_lib -ltdecore -lDCOP", LIBS => "-L$qt_lib -ltqt-mt -L$tde_lib -ltdecore -lDCOP",
XS => {'DCOP.xs' => 'DCOP.cpp'}, XS => {'DCOP.xs' => 'DCOP.cpp'},
XSOPT => '-C++', XSOPT => '-C++',
CCFLAGS => '-x c++', CCFLAGS => '-x c++',

2
kalyptus/kalyptusDataDict.pm
Unescape View File

@ -2250,7 +2250,7 @@ BEGIN
'TQWindowsStyle*' => 'qt_QWindowsStyle*', 'TQWindowsStyle*' => 'qt_QWindowsStyle*',
'TQWizard*' => 'qt_QWizard*', 'TQWizard*' => 'qt_QWizard*',
'TQWorkspace*' => 'qt_QWorkspace*', 'TQWorkspace*' => 'qt_QWorkspace*',
'TQXEmbed*' => 'qt_QXEmbed*' , 'QXEmbed*' => 'qt_QXEmbed*' ,
'TQXmlAttributes&' => 'qt_QXmlAttributes*' , 'TQXmlAttributes&' => 'qt_QXmlAttributes*' ,
'TQXmlAttributes*' => 'qt_QXmlAttributes*', 'TQXmlAttributes*' => 'qt_QXmlAttributes*',
'TQXmlContentHandler*' => 'qt_QXmlContentHandler*' , 'TQXmlContentHandler*' => 'qt_QXmlContentHandler*' ,

2
korundum/rubylib/examples/uimodules/uimisc.rb
Unescape View File

@ -259,7 +259,7 @@ def UIMisc.miscKThemeBase(parent)
parent.currentPageObj = PageNotImpl.new(parent) parent.currentPageObj = PageNotImpl.new(parent)
end end
def UIMisc.miscTQXEmbed(parent) def UIMisc.miscQXEmbed(parent)
parent.currentPageObj = PageNotImpl.new(parent) parent.currentPageObj = PageNotImpl.new(parent)
end end

2
korundum/rubylib/examples/uisampler.rb
Unescape View File

@ -112,7 +112,7 @@ $listItems = {"Dialogs" =>
"KDE::SharedPixmap" => [], "KDE::SharedPixmap" => [],
"KDE::SystemTray" => [], "KDE::SystemTray" => [],
"KDE::ThemeBase" => ["KDE::ThemeCache", "KDE::ThemePixmap", "KDE::ThemeStyle"], "KDE::ThemeBase" => ["KDE::ThemeCache", "KDE::ThemePixmap", "KDE::ThemeStyle"],
"TQXEmbed" => []}} "QXEmbed" => []}}
BLANK_MSG = <<END_OF_STRING BLANK_MSG = <<END_OF_STRING
<b>UISampler</b> - provides examples of <b>Korundum</b> widgets<p> <b>UISampler</b> - provides examples of <b>Korundum</b> widgets<p>

2
qtsharp/src/generator/Printer.cs
Unescape View File

@ -226,7 +226,7 @@ namespace QtCSharp {
{ {
if (check) if (check)
return "\n\n\t\t\tif ((qparent = parent) != null)\n" + return "\n\n\t\t\tif ((qparent = parent) != null)\n" +
"\t\t\t\parent.AddChild (this);\n"; "\t\t\tparent.AddChild (this);\n";
else else
return ""; return "";
} }

2
xparts/configure.in.in
Unescape View File

@ -1 +1 @@
DO_NOT_COMPILE="$DO_NOT_COMPILE xparts" # DO_NOT_COMPILE="$DO_NOT_COMPILE xparts"

2
xparts/src/kde/xparthost_kpart.cpp
Unescape View File

@ -21,7 +21,7 @@ XPartHost_KPart::XPartHost_KPart( TQWidget *parentWidget, const char *widgetName
{ {
m_stub = 0; m_stub = 0;
be = 0; be = 0;
embed = new TQXEmbed(parentWidget, widgetName); embed = new QXEmbed(parentWidget, widgetName);
setWidget(embed); setWidget(embed);
} }

4
xparts/src/kde/xparthost_kpart.h
Unescape View File

@ -7,7 +7,7 @@
class XPart_stub; class XPart_stub;
class KBrowserSignals; class KBrowserSignals;
class TQXEmbed; class QXEmbed;
/** /**
@ -68,7 +68,7 @@ private:
DCOPRef m_part; DCOPRef m_part;
XPart_stub *m_stub; XPart_stub *m_stub;
KBrowserSignals *be; KBrowserSignals *be;
TQXEmbed *embed; QXEmbed *embed;
}; };
#endif #endif

Write Preview
Loading…
Cancel
Save