TDE
/
tdetoys
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdetoys
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 3e2a2c4329
commit ada451a25c
13 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File

2
amor/Makefile.am
Unescape View File

@ -15,7 +15,7 @@ amor_SOURCES = amordialog.cpp amor.cpp amorwidget.cpp main.cpp amoranim.cpp amor
include_HEADERS = AmorIface.h include_HEADERS = AmorIface.h
# the library search path # the library search path
amor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor amor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
# the libraries to link against. Be aware of the order. First the libraries, # the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones. # that depend on the following ones.

2
kodo/Makefile.am
Unescape View File

@ -7,7 +7,7 @@ kodo_SOURCES = main.cpp kodometer.cpp kimagenumber.cpp
METASOURCES = AUTO METASOURCES = AUTO
# the library search path. # the library search path.
kodo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kodo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kodo_LDADD = $(LIB_TDEUI) kodo_LDADD = $(LIB_TDEUI)
messages: messages:

2
kteatime/Makefile.am
Unescape View File

@ -6,7 +6,7 @@ bin_PROGRAMS = kteatime
kteatime_SOURCES = main.cpp toplevel.cpp tealist.cpp timeedit.cpp kteatime_SOURCES = main.cpp toplevel.cpp tealist.cpp timeedit.cpp
kteatime_METASOURCES = AUTO kteatime_METASOURCES = AUTO
kteatime_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kteatime_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
# LIB_KIO needed for KNotifyDialog # LIB_KIO needed for KNotifyDialog
kteatime_LDADD = $(LIB_TDEUI) $(LIB_KIO) kteatime_LDADD = $(LIB_TDEUI) $(LIB_KIO)

2
ktux/CMakeLists.txt
Unescape View File

@ -29,7 +29,7 @@ link_directories(
tde_add_executable( ktux AUTOMOC tde_add_executable( ktux AUTOMOC
SOURCES spriteanim.cpp spritemisc.cpp SOURCES spriteanim.cpp spritemisc.cpp
spritepm.cpp sprite.cpp spritepm.cpp sprite.cpp
LINK kio-shared kscreensaver-shared LINK kio-shared tdescreensaver-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

4
ktux/Makefile.am
Unescape View File

@ -12,10 +12,10 @@ bin_PROGRAMS = ktux
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
# the library search path. # the library search path.
ktux_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor ktux_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
# the libraries to link against. # the libraries to link against.
ktux_LDADD = $(LIB_TDEUI) -lkscreensaver ktux_LDADD = $(LIB_TDEUI) -ltdescreensaver
# which sources should be compiled for ktux # which sources should be compiled for ktux
ktux_SOURCES = spriteanim.cpp spritemisc.cpp spritepm.cpp sprite.cpp ktux_SOURCES = spriteanim.cpp spritemisc.cpp spritepm.cpp sprite.cpp

2
ktux/ktux.desktop
Unescape View File

@ -86,7 +86,7 @@ Name[xh]=Iyacwangciswa...
Name[zh_CN]=设置... Name[zh_CN]=设置...
Name[zh_TW]=設定... Name[zh_TW]=設定...
Name[zu]=Iyalungiselela... Name[zu]=Iyalungiselela...
Icon=kscreensaver Icon=tdescreensaver
[Desktop Action InWindow] [Desktop Action InWindow]
Exec=ktux -window-id %w Exec=ktux -window-id %w

2
ktux/sprite.cpp
Unescape View File

@ -23,7 +23,7 @@
#include "sprite.moc" #include "sprite.moc"
// libkscreensaver interface // libtdescreensaver interface
extern "C" extern "C"
{ {
KDE_EXPORT const char *kss_applicationName = "ktux"; KDE_EXPORT const char *kss_applicationName = "ktux";

2
ktux/sprite.h
Unescape View File

@ -13,7 +13,7 @@
#include <tqptrlist.h> #include <tqptrlist.h>
#include <tqstrlist.h> #include <tqstrlist.h>
#include <tqcanvas.h> #include <tqcanvas.h>
#include <kscreensaver.h> #include <tdescreensaver.h>
#include "spriteanim.h" #include "spriteanim.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

6
kweather/CMakeLists.txt
Unescape View File

@ -29,7 +29,7 @@ link_directories(
tde_add_tdeinit_executable( kweatherreport AUTOMOC tde_add_tdeinit_executable( kweatherreport AUTOMOC
SOURCES reportmain.cpp weatherservice.stub SOURCES reportmain.cpp weatherservice.stub
reportview.cpp reportview.cpp
LINK tdeui-shared khtml-shared LINK tdeui-shared tdehtml-shared
) )
@ -84,7 +84,7 @@ tde_add_kpart( weather_panelapplet AUTOMOC
SOURCES reportview.cpp kweather.cpp SOURCES reportview.cpp kweather.cpp
dockwidget.cpp weatherIface.skel dockwidget.cpp weatherIface.skel
weatherservice.stub weatherbutton.cpp weatherservice.stub weatherbutton.cpp
LINK khtml-shared LINK tdehtml-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )
@ -105,7 +105,7 @@ tde_add_kpart( kcm_weatherservice AUTOMOC
SOURCES kcmweatherservice.cpp SOURCES kcmweatherservice.cpp
serviceconfigwidget.cpp serviceconfigdata.ui serviceconfigwidget.cpp serviceconfigdata.ui
weatherservice.stub weatherservice.stub
LINK tdeui-shared khtml-shared LINK tdeui-shared tdehtml-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

2
kweather/Makefile.am
Unescape View File

@ -56,7 +56,7 @@ kcm_weatherservice_la_LIBADD = $(LIB_TDEUI)
#globaladddir = $(kde_datadir)/konqsidebartng/add #globaladddir = $(kde_datadir)/konqsidebartng/add
#globaladd_DATA = weatherbar_add.desktop #globaladd_DATA = weatherbar_add.desktop
kweatherservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kweatherservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kweatherservice_LDADD = $(LIB_KIO) kweatherservice_LDADD = $(LIB_KIO)
kweatherservice_SOURCES = main.cpp metar_parser.cpp weatherlib.cpp \ kweatherservice_SOURCES = main.cpp metar_parser.cpp weatherlib.cpp \
weatherservice.cpp weatherservice.skel \ weatherservice.cpp weatherservice.skel \

4
kweather/reportview.cpp
Unescape View File

@ -19,8 +19,8 @@
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <khtml_part.h> #include <tdehtml_part.h>
#include <khtmlview.h> #include <tdehtmlview.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <tqvbox.h> #include <tqvbox.h>

6
kweather/weatherbar.h
Unescape View File

@ -23,9 +23,9 @@
#define __KONTQSIDEBARWEATHER_H__ #define __KONTQSIDEBARWEATHER_H__
#include <konqsidebarplugin.h> #include <konqsidebarplugin.h>
#include <kparts/part.h> #include <tdeparts/part.h>
#include <kparts/factory.h> #include <tdeparts/factory.h>
#include <kparts/browserextension.h> #include <tdeparts/browserextension.h>
#include <tqdict.h> #include <tqdict.h>
#include <dcopobject.h> #include <dcopobject.h>
#include <tqlayout.h> #include <tqlayout.h>

2
kworldwatch/Makefile.am
Unescape View File

@ -11,7 +11,7 @@ INCLUDES = $(all_includes)
kworldclock_SOURCES = main.cpp kworldclock_SOURCES = main.cpp
kworldclock_LDADD = libww.la $(LIB_TDEUI) -ltdefx kworldclock_LDADD = libww.la $(LIB_TDEUI) -ltdefx
kworldclock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kworldclock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
xdg_apps_DATA= kworldclock.desktop xdg_apps_DATA= kworldclock.desktop

Write Preview
Loading…
Cancel
Save