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

Rename a number of libraries and executables to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 14b1eb042e
commit 33be37a9fd
26 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File

4
ChangeLog
Unescape View File

@ -13026,7 +13026,7 @@ v0.1.0-beta2 2005-02-08
* galleryexport/: galleryviewitem.cpp, gallerywindow.cpp,
gallerywindow.h:
* kwallet integration for saving/restoring password (for kde >
* tdewallet integration for saving/restoring password (for kde >
3.1). for kde <= 3.1, only the url and username are saved
restored. * promote the album title as the main text (in the
album treeview list)
@ -13091,7 +13091,7 @@ v0.1.0-beta2 2005-02-08
kde standard imageviewer
Things to do: * implement adding new albums * implement adding
new photos * kwallet integration for saving/restoring
new photos * tdewallet integration for saving/restoring
remote-url/username/password
So currently only read-only support. putting this in so that we

26
acinclude.m4
Unescape View File

@ -2099,16 +2099,16 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils")
AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest")
AC_SUBST(LIB_KDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio")
@ -2116,13 +2116,13 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
@ -2571,7 +2571,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we
dnl continue with a warning (the user will get no jpeg support in khtml)
dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still
dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@ -3514,7 +3514,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN)
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
AC_SUBST(KDE_CHECK_PLUGIN)

4
kipi-plugins/ChangeLog
Unescape View File

@ -13152,7 +13152,7 @@ v0.1.0-beta2 2005-02-08
* galleryexport/: galleryviewitem.cpp, gallerywindow.cpp,
gallerywindow.h:
* kwallet integration for saving/restoring password (for kde >
* tdewallet integration for saving/restoring password (for kde >
3.1). for kde <= 3.1, only the url and username are saved
restored. * promote the album title as the main text (in the
album treeview list)
@ -13217,7 +13217,7 @@ v0.1.0-beta2 2005-02-08
kde standard imageviewer
Things to do: * implement adding new albums * implement adding
new photos * kwallet integration for saving/restoring
new photos * tdewallet integration for saving/restoring
remote-url/username/password
So currently only read-only support. putting this in so that we

4
kipi-plugins/flickrexport/flickrwidget.cpp
Unescape View File

@ -43,8 +43,8 @@
#include <kdialog.h>
#include <kactivelabel.h>
#include <klocale.h>
#include <khtml_part.h>
#include <khtmlview.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
#include <kseparator.h>
#include <kiconloader.h>
#include <kapplication.h>

6
kipi-plugins/flickrexport/flickrwindow.cpp
Unescape View File

@ -42,15 +42,15 @@
#include <kmessagebox.h>
#include <kapplication.h>
#include <kiconloader.h>
#include <khtml_part.h>
#include <khtmlview.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
#include <ktabwidget.h>
#include <krun.h>
#include <kdebug.h>
#include <kconfig.h>
#include <tdeversion.h>
#if KDE_IS_VERSION(3,2,0)
#include <kwallet.h>
#include <tdewallet.h>
#endif
// Libkipi includes.

2
kipi-plugins/galleryexport/Makefile.am
Unescape View File

@ -14,7 +14,7 @@ kipiplugin_galleryexport_la_SOURCES = plugin_galleryexport.cpp \
galleryviewitem.cpp
kipiplugin_galleryexport_la_LIBADD = $(LIBKEXIV2_LIBS) \
-lkwalletclient $(LIB_KHTML) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
-ltdewalletclient $(LIB_KHTML) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
kipiplugin_galleryexport_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins

14
kipi-plugins/galleryexport/galleries.cpp
Unescape View File

@ -25,7 +25,7 @@
#include <klocale.h>
#include <tdeversion.h>
#if KDE_IS_VERSION(3,2,0)
#include <kwallet.h>
#include <tdewallet.h>
#endif
#include "galleries.h"
@ -123,18 +123,18 @@ void Galleries::Load()
KWallet::Wallet::Synchronous);
if (!mpWallet)
{
kdWarning() << "Failed to open kwallet" << endl;
kdWarning() << "Failed to open tdewallet" << endl;
}
else
{
if (!mpWallet->hasFolder("KIPIGallerySyncPlugin"))
{
if (!mpWallet->createFolder("KIPIGallerySyncPlugin"))
kdWarning() << "Failed to create kwallet folder" << endl;
kdWarning() << "Failed to create tdewallet folder" << endl;
}
if (!mpWallet->setFolder("KIPIGallerySyncPlugin"))
kdWarning() << "Failed to set kwallet folder" << endl;
kdWarning() << "Failed to set tdewallet folder" << endl;
else
bln_use_wallet = true;
}
@ -198,13 +198,13 @@ void Galleries::Save()
if (mpWallet->hasFolder("KIPIGallerySyncPlugin"))
{
if (!mpWallet->removeFolder("KIPIGallerySyncPlugin"))
kdWarning() << "Failed to clear kwallet folder" << endl;
kdWarning() << "Failed to clear tdewallet folder" << endl;
}
if (!mpWallet->createFolder("KIPIGallerySyncPlugin"))
kdWarning() << "Failed to create kwallet folder" << endl;
kdWarning() << "Failed to create tdewallet folder" << endl;
if (!mpWallet->setFolder("KIPIGallerySyncPlugin"))
kdWarning() << "Failed to set kwallet folder" << endl;
kdWarning() << "Failed to set tdewallet folder" << endl;
else
bln_use_wallet = true;
}

4
kipi-plugins/galleryexport/galleryconfig.cpp
Unescape View File

@ -36,8 +36,8 @@
#include <kmessagebox.h>
#include <kapplication.h>
#include <kiconloader.h>
#include <khtml_part.h>
#include <khtmlview.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
#include <krun.h>
#include <kdebug.h>
#include <kconfig.h>

4
kipi-plugins/galleryexport/gallerywidget.cpp
Unescape View File

@ -20,8 +20,8 @@
* ============================================================ */
#include <klocale.h>
#include <khtml_part.h>
#include <khtmlview.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
#include <tqpushbutton.h>
#include <tqlabel.h>

4
kipi-plugins/galleryexport/gallerywindow.cpp
Unescape View File

@ -40,8 +40,8 @@
#include <kmessagebox.h>
#include <kapplication.h>
#include <kiconloader.h>
#include <khtml_part.h>
#include <khtmlview.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
#include <krun.h>
#include <kdebug.h>
#include <kconfig.h>

2
kipi-plugins/gpssync/gpseditdialog.cpp
Unescape View File

@ -38,7 +38,7 @@
#include <kapplication.h>
#include <klineedit.h>
#include <kmessagebox.h>
#include <khtmlview.h>
#include <tdehtmlview.h>
#include <kpopupmenu.h>
// Local includes.

10
kipi-plugins/gpssync/gpsmapwidget.cpp
Unescape View File

@ -24,7 +24,7 @@
// KDE includes.
#include <kdebug.h>
#include <khtmlview.h>
#include <tdehtmlview.h>
#include <kurl.h>
// Local includes.
@ -122,7 +122,7 @@ void GPSMapWidget::extractGPSPositionfromStatusbar(const TQString& txt)
emit signalNewGPSLocationFromMap(d->latitude, d->longitude, d->altitude);
}
void GPSMapWidget::khtmlMouseMoveEvent(khtml::MouseMoveEvent *e)
void GPSMapWidget::tdehtmlMouseMoveEvent(tdehtml::MouseMoveEvent *e)
{
TQString status = jsStatusBarText();
@ -131,10 +131,10 @@ void GPSMapWidget::khtmlMouseMoveEvent(khtml::MouseMoveEvent *e)
if (status.startsWith(TQString("(lat:")))
extractGPSPositionfromStatusbar(status);
KHTMLPart::khtmlMouseMoveEvent(e);
KHTMLPart::tdehtmlMouseMoveEvent(e);
}
void GPSMapWidget::khtmlMouseReleaseEvent(khtml::MouseReleaseEvent *e)
void GPSMapWidget::tdehtmlMouseReleaseEvent(tdehtml::MouseReleaseEvent *e)
{
TQString status = jsStatusBarText();
@ -159,7 +159,7 @@ void GPSMapWidget::khtmlMouseReleaseEvent(khtml::MouseReleaseEvent *e)
d->mapType = status;
}
KHTMLPart::khtmlMouseReleaseEvent(e);
KHTMLPart::tdehtmlMouseReleaseEvent(e);
}
void GPSMapWidget::resized()

6
kipi-plugins/gpssync/gpsmapwidget.h
Unescape View File

@ -30,7 +30,7 @@
// KDE includes.
#include <khtml_part.h>
#include <tdehtml_part.h>
namespace KIPIGPSSyncPlugin
{
@ -66,8 +66,8 @@ signals:
protected:
void khtmlMouseMoveEvent(khtml::MouseMoveEvent*);
void khtmlMouseReleaseEvent(khtml::MouseReleaseEvent *);
void tdehtmlMouseMoveEvent(tdehtml::MouseMoveEvent*);
void tdehtmlMouseReleaseEvent(tdehtml::MouseReleaseEvent *);
private:

4
kipi-plugins/picasawebexport/picasawebwidget.cpp
Unescape View File

@ -41,8 +41,8 @@
// KDE includes.
#include <klocale.h>
#include <khtml_part.h>
#include <khtmlview.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
// Local includes.

6
kipi-plugins/picasawebexport/picasawebwindow.cpp
Unescape View File

@ -47,14 +47,14 @@
#include <kmessagebox.h>
#include <kapplication.h>
#include <kiconloader.h>
#include <khtml_part.h>
#include <khtmlview.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
#include <krun.h>
#include <kdebug.h>
#include <ksimpleconfig.h>
#include <tdeversion.h>
#if KDE_IS_VERSION(3,2,0)
#include <kwallet.h>
#include <tdewallet.h>
#endif
// Libkipi includes.

2
kipi-plugins/sync/Makefile.am
Unescape View File

@ -16,7 +16,7 @@ kipiplugin_sync_la_SOURCES = plugin_sync.cpp \
sinks/gallery/gallerycollection.cpp sinks/gallery/galleryitem.cpp
kipiplugin_sync_la_LIBADD = $(LIBKEXIV2_LIBS) \
-lkwalletclient $(LIB_KHTML) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
-ltdewalletclient $(LIB_KHTML) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
kipiplugin_sync_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins

4
kipi-plugins/sync/galleryconfig.cpp
Unescape View File

@ -36,8 +36,8 @@
#include <kmessagebox.h>
#include <kapplication.h>
#include <kiconloader.h>
#include <khtml_part.h>
#include <khtmlview.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
#include <krun.h>
#include <kdebug.h>
#include <kconfig.h>

4
kipi-plugins/sync/gallerywidget.cpp
Unescape View File

@ -20,8 +20,8 @@
* ============================================================ */
#include <klocale.h>
#include <khtml_part.h>
#include <khtmlview.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
#include <tqpushbutton.h>
#include <tqlabel.h>

4
kipi-plugins/sync/gallerywindow.cpp
Unescape View File

@ -40,8 +40,8 @@
#include <kmessagebox.h>
#include <kapplication.h>
#include <kiconloader.h>
#include <khtml_part.h>
#include <khtmlview.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
#include <krun.h>
#include <kdebug.h>
#include <kconfig.h>

2
kipi-plugins/sync/sink.h
Unescape View File

@ -25,7 +25,7 @@
#include <kconfig.h>
#include <tdeversion.h>
#if KDE_IS_VERSION(3,2,0)
#include <kwallet.h>
#include <tdewallet.h>
#endif
namespace KIPI2

14
kipi-plugins/sync/sinks.cpp
Unescape View File

@ -25,7 +25,7 @@
#include <klocale.h>
#include <tdeversion.h>
#if KDE_IS_VERSION(3,2,0)
#include <kwallet.h>
#include <tdewallet.h>
#endif
#include "sinks.h"
@ -65,18 +65,18 @@ Sinks::Sinks()
KWallet::Wallet::Synchronous);
if (!mpWallet)
{
kdWarning() << "Failed to open kwallet" << endl;
kdWarning() << "Failed to open tdewallet" << endl;
}
else
{
if (!mpWallet->hasFolder("KIPISyncPlugin"))
{
if (!mpWallet->createFolder("KIPISyncPlugin"))
kdWarning() << "Failed to create kwallet folder" << endl;
kdWarning() << "Failed to create tdewallet folder" << endl;
}
if (!mpWallet->setFolder("KIPISyncPlugin"))
kdWarning() << "Failed to set kwallet folder" << endl;
kdWarning() << "Failed to set tdewallet folder" << endl;
else
p_wallet = mpWallet;
}
@ -155,13 +155,13 @@ void Sinks::Save()
if (mpWallet->hasFolder("KIPISyncPlugin"))
{
if (!mpWallet->removeFolder("KIPISyncPlugin"))
kdWarning() << "Failed to clear kwallet folder" << endl;
kdWarning() << "Failed to clear tdewallet folder" << endl;
}
if (!mpWallet->createFolder("KIPISyncPlugin"))
kdWarning() << "Failed to create kwallet folder" << endl;
kdWarning() << "Failed to create tdewallet folder" << endl;
if (!mpWallet->setFolder("KIPISyncPlugin"))
kdWarning() << "Failed to set kwallet folder" << endl;
kdWarning() << "Failed to set tdewallet folder" << endl;
else
p_wallet = mpWallet;
}

6
po/lt/kipiplugin_batchprocessimages.po
Unescape View File

@ -124,7 +124,7 @@ msgstr ""
"&Įdėti...\n"
"#-#-#-#-# tdelibs.po (tdelibs) #-#-#-#-#\n"
"&Pridėti...\n"
"#-#-#-#-# kpartsaver.po (kpartsaver) #-#-#-#-#\n"
"#-#-#-#-# tdepartsaver.po (tdepartsaver) #-#-#-#-#\n"
"&Įdėti...\n"
"#-#-#-#-# kuser.po (kuser) #-#-#-#-#\n"
"&Pridėti...\n"
@ -205,7 +205,7 @@ msgstr ""
"&Sustabdyti\n"
"#-#-#-#-# kmousetool.po (kmousetool) #-#-#-#-#\n"
"&Sustabdyti\n"
"#-#-#-#-# kmid.po (kmid) #-#-#-#-#\n"
"#-#-#-#-# tdemid.po (tdemid) #-#-#-#-#\n"
"&Stop\n"
"#-#-#-#-# kaboodle.po (kaboodle) #-#-#-#-#\n"
"&Stop\n"
@ -811,7 +811,7 @@ msgstr ""
"Nieko\n"
"#-#-#-#-# kppp.po (kppp) #-#-#-#-#\n"
"Nėra\n"
"#-#-#-#-# kmid.po (kmid) #-#-#-#-#\n"
"#-#-#-#-# tdemid.po (tdemid) #-#-#-#-#\n"
"Nėra\n"
"#-#-#-#-# noatun.po (noatun) #-#-#-#-#\n"
"Nieko"

2
po/lt/kipiplugin_calendar.po
Unescape View File

@ -98,7 +98,7 @@ msgstr ""
"Nustatymai\n"
"#-#-#-#-# kchart.po (kchart) #-#-#-#-#\n"
"Nustatymai\n"
"#-#-#-#-# kpartsaver.po (kpartsaver) #-#-#-#-#\n"
"#-#-#-#-# tdepartsaver.po (tdepartsaver) #-#-#-#-#\n"
"Nustatymai\n"
"#-#-#-#-# libk3b.po (libk3b) #-#-#-#-#\n"
"Nustatymai\n"

2
po/lt/kipiplugin_mpegencoder.po
Unescape View File

@ -636,7 +636,7 @@ msgstr ""
"&Įdėti...\n"
"#-#-#-#-# tdelibs.po (tdelibs) #-#-#-#-#\n"
"&Pridėti...\n"
"#-#-#-#-# kpartsaver.po (kpartsaver) #-#-#-#-#\n"
"#-#-#-#-# tdepartsaver.po (tdepartsaver) #-#-#-#-#\n"
"&Įdėti...\n"
"#-#-#-#-# kuser.po (kuser) #-#-#-#-#\n"
"&Pridėti...\n"

2
po/lt/kipiplugin_rawconverter.po
Unescape View File

@ -155,7 +155,7 @@ msgstr ""
"Nustatymai\n"
"#-#-#-#-# kchart.po (kchart) #-#-#-#-#\n"
"Nustatymai\n"
"#-#-#-#-# kpartsaver.po (kpartsaver) #-#-#-#-#\n"
"#-#-#-#-# tdepartsaver.po (tdepartsaver) #-#-#-#-#\n"
"Nustatymai\n"
"#-#-#-#-# libk3b.po (libk3b) #-#-#-#-#\n"
"Nustatymai\n"

2
po/lt/kipiplugin_slideshow.po
Unescape View File

@ -199,7 +199,7 @@ msgstr ""
"Nieko\n"
"#-#-#-#-# kppp.po (kppp) #-#-#-#-#\n"
"Nėra\n"
"#-#-#-#-# kmid.po (kmid) #-#-#-#-#\n"
"#-#-#-#-# tdemid.po (tdemid) #-#-#-#-#\n"
"Nėra\n"
"#-#-#-#-# noatun.po (noatun) #-#-#-#-#\n"
"Nieko"

Write Preview
Loading…
Cancel
Save