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

Additional renaming of kde to tde

Browse Source
r14.0.x
Timothy Pearson 13 years ago
parent 1bdf523fc6
commit fb0ffeebca
16 changed files with 93 additions and 93 deletions
Show Stats Download Patch File Download Diff File

2
Changelog
Unescape View File

@ -252,7 +252,7 @@
and listing tab.
* added action to switch between header and implementation
* added "port", "firmware-dir", and "target-self-powered" options to command-line programmer
* command-line programmer can be compiled without kdelibs (Qt3 or Qt4)
* command-line programmer can be compiled without tdelibs (Qt3 or Qt4)
* command-line programmer for Windows (Qt4): works for serial ICD2 and serial "direct" programmers
* interactive mode for command-line programmer with debugging support

126
acinclude.m4
Unescape View File

@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
dnl Please do not modify this file unless you expect your modifications to be
dnl carried into every other module in the repository.
dnl
dnl Single-module modifications are best placed in configure.in for kdelibs
dnl and kdebase or configure.in.in if present.
dnl Single-module modifications are best placed in configure.in for tdelibs
dnl and tdebase or configure.in.in if present.
# KDE_PATH_X_DIRECT
dnl Internal subroutine of AC_PATH_X.
@ -103,41 +103,41 @@ ac_x_libraries=],
[LIBS="$ac_save_LIBS"
# First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release.
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
/usr/X11/lib${kdelibsuff} \
/usr/X11R6/lib${kdelibsuff} \
/usr/X11R5/lib${kdelibsuff} \
/usr/X11R4/lib${kdelibsuff} \
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
/usr/X11/lib${tdelibsuff} \
/usr/X11R6/lib${tdelibsuff} \
/usr/X11R5/lib${tdelibsuff} \
/usr/X11R4/lib${tdelibsuff} \
\
/usr/lib${kdelibsuff}/X11 \
/usr/lib${kdelibsuff}/X11R6 \
/usr/lib${kdelibsuff}/X11R5 \
/usr/lib${kdelibsuff}/X11R4 \
/usr/lib${tdelibsuff}/X11 \
/usr/lib${tdelibsuff}/X11R6 \
/usr/lib${tdelibsuff}/X11R5 \
/usr/lib${tdelibsuff}/X11R4 \
\
/usr/local/X11/lib${kdelibsuff} \
/usr/local/X11R6/lib${kdelibsuff} \
/usr/local/X11R5/lib${kdelibsuff} \
/usr/local/X11R4/lib${kdelibsuff} \
/usr/local/X11/lib${tdelibsuff} \
/usr/local/X11R6/lib${tdelibsuff} \
/usr/local/X11R5/lib${tdelibsuff} \
/usr/local/X11R4/lib${tdelibsuff} \
\
/usr/local/lib${kdelibsuff}/X11 \
/usr/local/lib${kdelibsuff}/X11R6 \
/usr/local/lib${kdelibsuff}/X11R5 \
/usr/local/lib${kdelibsuff}/X11R4 \
/usr/local/lib${tdelibsuff}/X11 \
/usr/local/lib${tdelibsuff}/X11R6 \
/usr/local/lib${tdelibsuff}/X11R5 \
/usr/local/lib${tdelibsuff}/X11R4 \
\
/usr/X386/lib${kdelibsuff} \
/usr/x386/lib${kdelibsuff} \
/usr/XFree86/lib${kdelibsuff}/X11 \
/usr/X386/lib${tdelibsuff} \
/usr/x386/lib${tdelibsuff} \
/usr/XFree86/lib${tdelibsuff}/X11 \
\
/usr/lib${kdelibsuff} \
/usr/local/lib${kdelibsuff} \
/usr/unsupported/lib${kdelibsuff} \
/usr/athena/lib${kdelibsuff} \
/usr/local/x11r5/lib${kdelibsuff} \
/usr/lpp/Xamples/lib${kdelibsuff} \
/lib/usr/lib${kdelibsuff}/X11 \
/usr/lib${tdelibsuff} \
/usr/local/lib${tdelibsuff} \
/usr/unsupported/lib${tdelibsuff} \
/usr/athena/lib${tdelibsuff} \
/usr/local/x11r5/lib${tdelibsuff} \
/usr/lpp/Xamples/lib${tdelibsuff} \
/lib/usr/lib${tdelibsuff}/X11 \
\
/usr/openwin/lib${kdelibsuff} \
/usr/openwin/share/lib${kdelibsuff} \
/usr/openwin/lib${tdelibsuff} \
/usr/openwin/share/lib${tdelibsuff} \
; \
do
dnl Don't even attempt the hair of trying to link an X program!
@ -378,7 +378,7 @@ if AC_TRY_EVAL(ac_link) && test -s conftest; then
else
AC_MSG_ERROR([your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the
same compiler to compile Qt and kdelibs as you did use now.
same compiler to compile Qt and tdelibs as you did use now.
For more details about this problem, look at the end of config.log.])
fi
@ -937,7 +937,7 @@ mips-sgi-irix6*)
ac_x_includes="."
fi
if test -z "$ac_x_libraries"; then
ac_x_libraries="/usr/lib${kdelibsuff}"
ac_x_libraries="/usr/lib${tdelibsuff}"
fi
esac
#from now on we use our own again
@ -1418,7 +1418,7 @@ qt_includes=""
AC_ARG_WITH(qt-dir,
AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
[ ac_qt_includes="$withval"/include
ac_qt_libraries="$withval"/lib${kdelibsuff}
ac_qt_libraries="$withval"/lib${tdelibsuff}
ac_qt_bindir="$withval"/bin
])
@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir"
qt_libdirs=""
for dir in $kde_qt_dirs; do
qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
done
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then
@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp
AC_MSG_RESULT([$kde_cv_uic_plugins])
if test "$kde_cv_uic_plugins" != yes; then
AC_MSG_ERROR([
you need to install kdelibs first.
you need to install tdelibs first.
If you did install kdelibs, then the Qt version that is picked up by
this configure is not the same version you used to compile kdelibs.
The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the
If you did install tdelibs, then the Qt version that is picked up by
this configure is not the same version you used to compile tdelibs.
The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the
_same Qt version_, compiled with the _same compiler_ and the same Qt
configuration settings.
])
@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
So, check this please and use another prefix!])
fi
kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${tdelibsuff} $KDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
ac_kde_libraries="$kde_libdir"
@ -1824,7 +1824,7 @@ fi
if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed
by kdelibs])
by tdelibs])
fi
if test -n "$kde_widgetdir"; then
@ -1839,7 +1839,7 @@ else
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
fi
else dnl test -z $1, e.g. from kdelibs
else dnl test -z $1, e.g. from tdelibs
ac_cv_have_kde="have_kde=no"
@ -3499,16 +3499,16 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config
AC_DEFUN([KDE_CHECK_LIB64],
[
kdelibsuff="$kde_libs_suffix"
if test -z "$kdelibsuff"; then
kdelibsuff="no"
tdelibsuff="$kde_libs_suffix"
if test -z "$tdelibsuff"; then
tdelibsuff="no"
fi
AC_ARG_ENABLE(libsuffix,
AC_HELP_STRING([--enable-libsuffix],
[/lib directory suffix (64,32,none,auto[=default])]),
kdelibsuff=$enableval)
tdelibsuff=$enableval)
if test "$kdelibsuff" = "auto"; then
if test "$tdelibsuff" = "auto"; then
cat > conftest.c << EOF
#include <stdio.h>
@ -3516,26 +3516,26 @@ int main() {
return 0;
}
EOF
kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
s,.*/lib\([[^\/]]*\)/.*,\1,
p
}'`
rm -rf conftest.*
fi
if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
kdelibsuff=
if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then
tdelibsuff=
fi
if test -z "$kdelibsuff"; then
if test -z "$tdelibsuff"; then
AC_MSG_RESULT([not using lib directory suffix])
AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
else
if test "$libdir" = '${exec_prefix}/lib'; then
libdir="$libdir${kdelibsuff}"
libdir="$libdir${tdelibsuff}"
AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms
fi
AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories)
AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories)
AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
fi
])
@ -4560,7 +4560,7 @@ fi
PYTHONINC=-I$python_incdir
python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
if test ! -r $python_libdir/libpython$version.so; then
AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@ -4948,7 +4948,7 @@ AC_DEFUN([KDE_CONF_FILES],
AC_SUBST(CONF_FILES)
])dnl
dnl This sets the prefix, for arts and kdelibs
dnl This sets the prefix, for arts and tdelibs
dnl Do NOT use in any other module.
dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde
AC_DEFUN([KDE_SET_PREFIX_CORE],
@ -4995,9 +4995,9 @@ AC_DEFUN([KDE_SET_PREFIX],
kde_libs_prefix=`$KDECONFIG --prefix`
if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
This means it has been moved since you installed it.
This won't work. Please recompile kdelibs for the new prefix.
This won't work. Please recompile tdelibs for the new prefix.
])
fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@ -5663,7 +5663,7 @@ ssl_includes=""
AC_ARG_WITH(ssl-dir,
AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
[ ac_ssl_includes="$withval"/include
ac_ssl_libraries="$withval"/lib$kdelibsuff
ac_ssl_libraries="$withval"/lib$tdelibsuff
])
want_ssl=yes
@ -5683,7 +5683,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
ac_ssl_includes="$ssl_incdir"
ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs"
ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs"
if test ! "$ac_ssl_libraries" = "NO"; then
ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
fi
@ -5920,9 +5920,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
dnl also defines KSTUFF_PKG_ERRORS on error
AC_DEFUN([KDE_PKG_CHECK_MODULES], [
PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
if test "$prefix" != "$kde_libs_prefix"; then
PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
fi
export PKG_CONFIG_PATH
PKG_CHECK_MODULES([$1],[$2],[$3],[$4])

10
configure.in
Unescape View File

@ -67,12 +67,12 @@ dnl =======================================================
dnl PACKAGE set before
dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__
dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__
dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __kdevelop[exc]__
dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __tdevelop[noopt]__
dnl CFLAGS="$NOOPT_CFLAGS" dnl __tdevelop[noopt]__
dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __tdevelop[exc]__
dnl KDE_NEED_FLEX dnl __kdevelop__
dnl AC_PROG_YACC dnl __kdevelop__
dnl KDE_NEED_FLEX dnl __tdevelop__
dnl AC_PROG_YACC dnl __tdevelop__
# --------------------------------------------------------------------------
# check os

10
configure.in.in
Unescape View File

@ -2,12 +2,12 @@
AM_INIT_AUTOMAKE(piklab, 0.15.2)
dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__
dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__
dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __kdevelop[exc]__
dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __tdevelop[noopt]__
dnl CFLAGS="$NOOPT_CFLAGS" dnl __tdevelop[noopt]__
dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __tdevelop[exc]__
dnl KDE_NEED_FLEX dnl __kdevelop__
dnl AC_PROG_YACC dnl __kdevelop__
dnl KDE_NEED_FLEX dnl __tdevelop__
dnl AC_PROG_YACC dnl __tdevelop__
# --------------------------------------------------------------------------
# check os

6
piklab.kdevelop
Unescape View File

@ -1,5 +1,5 @@
<!DOCTYPE kdevelop>
<kdevelop>
<!DOCTYPE tdevelop>
<tdevelop>
<general>
<author>Nicolas Hadacek</author>
<email>hadacek@kde.org</email>
@ -262,4 +262,4 @@
<appskde>false</appskde>
<url/>
</dist>
</kdevelop>
</tdevelop>

4
piklab.spec
Unescape View File

@ -11,8 +11,8 @@ License: GPL
Group: Development/Other
Url: http://piklab.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: kdelibs-devel
#BuildRequires: kdebase-devel
BuildRequires: tdelibs-devel
#BuildRequires: tdebase-devel
BuildRequires: libusb-devel libreadline-devel ncurses-devel
Packager: hadacek@kde.org

4
po/cs.po
Unescape View File

@ -1755,8 +1755,8 @@ msgid "Could not determine processor (%1)."
msgstr "Nemohu najít soubor s chybami (%1)."
#: libgui/console.cpp:30
msgid "Could not find \"konsolepart\"; please install kdebase."
msgstr "Nemohu najít \"konsolepart\": Prosím nainstalujte kdebase."
msgid "Could not find \"konsolepart\"; please install tdebase."
msgstr "Nemohu najít \"konsolepart\": Prosím nainstalujte tdebase."
#: common/port/usb_port.cpp:210
msgid "Could not find USB device (vendor=%1 product=%2)."

2
po/de.po
Unescape View File

@ -1731,7 +1731,7 @@ msgid "Could not determine processor (%1)."
msgstr "Kann Fehlerausgabedatei (%1) nicht finden."
#: libgui/console.cpp:30
msgid "Could not find \"konsolepart\"; please install kdebase."
msgid "Could not find \"konsolepart\"; please install tdebase."
msgstr ""
#: common/port/usb_port.cpp:210

2
po/es.po
Unescape View File

@ -1702,7 +1702,7 @@ msgid "Could not determine processor (%1)."
msgstr ""
#: libgui/console.cpp:30
msgid "Could not find \"konsolepart\"; please install kdebase."
msgid "Could not find \"konsolepart\"; please install tdebase."
msgstr ""
#: common/port/usb_port.cpp:210

4
po/fr.po
Unescape View File

@ -1688,8 +1688,8 @@ msgid "Could not determine processor (%1)."
msgstr "Impossible de déterminer le processeur (%1)."
#: libgui/console.cpp:30
msgid "Could not find \"konsolepart\"; please install kdebase."
msgstr "« konsolepart » n'a pu être trouvé ; veuillez vérifier l'installation de kdebase."
msgid "Could not find \"konsolepart\"; please install tdebase."
msgstr "« konsolepart » n'a pu être trouvé ; veuillez vérifier l'installation de tdebase."
#: common/port/usb_port.cpp:210
msgid "Could not find USB device (vendor=%1 product=%2)."

4
po/hu.po
Unescape View File

@ -1760,8 +1760,8 @@ msgid "Could not determine processor (%1)."
msgstr "Nem találom a hibalista fájlt (%1)."
#: libgui/console.cpp:30
msgid "Could not find \"konsolepart\"; please install kdebase."
msgstr "Nem találom a \"konsolepart\"; telepítsd a kdebase csomagot"
msgid "Could not find \"konsolepart\"; please install tdebase."
msgstr "Nem találom a \"konsolepart\"; telepítsd a tdebase csomagot"
#: common/port/usb_port.cpp:210
msgid "Could not find USB device (vendor=%1 product=%2)."

2
po/it.po
Unescape View File

@ -1746,7 +1746,7 @@ msgid "Could not determine processor (%1)."
msgstr ""
#: libgui/console.cpp:30
msgid "Could not find \"konsolepart\"; please install kdebase."
msgid "Could not find \"konsolepart\"; please install tdebase."
msgstr ""
#: common/port/usb_port.cpp:210

2
po/piklab.pot
Unescape View File

@ -1713,7 +1713,7 @@ msgid "Could not determine processor (%1)."
msgstr ""
#: libgui/console.cpp:30
msgid "Could not find \"konsolepart\"; please install kdebase."
msgid "Could not find \"konsolepart\"; please install tdebase."
msgstr ""
#: common/port/usb_port.cpp:210

2
src/common/common/synchronous.cpp
Unescape View File

@ -17,7 +17,7 @@ Synchronous::Synchronous(uint timeout)
if (timeout) _timer.start(timeout, true);
}
// uplifted from kdelibs...
// uplifted from tdelibs...
void qt_enter_modal(TQWidget *widget);
void qt_leave_modal(TQWidget *widget);

4
src/common/nokde/win32_utils.h
Unescape View File

@ -22,7 +22,7 @@
#include <windows.h>
//#include <tdecore/kdelibs_export.h>
//#include <tdecore/tdelibs_export.h>
#define KDEWIN32_EXPORT
#ifdef __cplusplus
@ -89,7 +89,7 @@ TQCString getWin32LocaleName();
/*! Temporary solutiuon
\return a KFileDialog-compatible filter string converted to TQFileDialog compatible one.
This is temporary solution for kdelibs/win32... */
This is temporary solution for tdelibs/win32... */
KDEWIN32_EXPORT TQString convertKFileDialogFilterToTQFileDialogFilter(const TQString& filter);
#endif //__cplusplus

2
src/libgui/console.cpp
Unescape View File

@ -27,7 +27,7 @@ void ConsoleView::showEvent(TQShowEvent *e)
KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart");
TQVBoxLayout *top = new TQVBoxLayout(this, 0, 10);
if ( factory==0 ) {
TQLabel *label = new TQLabel(i18n("Could not find \"konsolepart\"; please install kdebase."), this);
TQLabel *label = new TQLabel(i18n("Could not find \"konsolepart\"; please install tdebase."), this);
label->show();
top->addWidget(label);
return;

Write Preview
Loading…
Cancel
Save