Additional kde to tde renaming

pull/1/head
Timothy Pearson 13 years ago
parent 5a290ef1b8
commit 5b8c3bc307

@ -371,7 +371,7 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
fi
AC_MSG_CHECKING([for KDE libraries installed])
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then
AC_MSG_RESULT(yes)
@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir)
AC_SUBST(kde_servicesdir)
AC_SUBST(kde_servicetypesdir)
AC_SUBST(kde_moduledir)
AC_SUBST(kdeinitdir, '$(kde_moduledir)')
AC_SUBST(tdeinitdir, '$(kde_moduledir)')
AC_SUBST(kde_styledir)
AC_SUBST(kde_widgetdir)
if test "$kde_qtver" = 1; then
@ -2088,12 +2088,12 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
if test $kde_qtver = 3; then
case $host in
*cygwin*) lib_kded="-lkdeinit_kded" ;;
*cygwin*) lib_kded="-ltdeinit_kded" ;;
*) lib_kded="" ;;
esac
AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_KDECORE, "-lkdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui")
AC_SUBST(LIB_KDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb")
@ -2102,9 +2102,9 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils")
AC_SUBST(LIB_KDEPIM, "-lkdepim")
AC_SUBST(LIB_KDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd")
@ -2113,8 +2113,8 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio")
elif test $kde_qtver = 2; then
AC_SUBST(LIB_KDECORE, "-lkdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui")
AC_SUBST(LIB_KDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca")
AC_SUBST(LIB_SMB, "-lsmb")
@ -2123,10 +2123,10 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
else
AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
@ -2513,7 +2513,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
else
AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
fi
])

@ -158,7 +158,7 @@ libamarok_la_LIBADD = \
$(top_builddir)/amarok/src/statusbar/libstatusbar.la \
$(top_builddir)/amarok/src/metadata/libmetadata.la \
$(top_builddir)/amarok/src/magnatunebrowser/libmagnatunebrowser.la \
$(LIB_QT) $(LIB_KPARTS) -lDCOP -lkdefx $(KDE_MT_LIBS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KHTML) $(LIB_KNEWSTUFF) \
$(LIB_QT) $(LIB_KPARTS) -lDCOP -ltdefx $(KDE_MT_LIBS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KHTML) $(LIB_KNEWSTUFF) \
$(TAGLIB_LIBS) $(gl_libs) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) \
$(LIB_TUNEPIMP) \
$(mysql_libs) \

@ -6,7 +6,7 @@ INCLUDES = -I$(top_srcdir)/amarok/src $(CFLAGS_AKODE) $(all_includes)
libamarok_aKode_engine_la_LIBADD = \
$(top_builddir)/amarok/src/libamarok.la \
$(top_builddir)/amarok/src/plugin/libplugin.la \
-lkdecore \
-ltdecore \
$(LIBS_AKODE)
libamarok_aKode_engine_la_SOURCES = akode-engine.cpp akode-scope.cpp

@ -31,7 +31,7 @@ libamarok_helixengine_plugin_la_LIBADD = \
$(top_builddir)/amarok/src/engine/helix/helix-sp/libhelix-sp.la \
$(top_builddir)/amarok/src/engine/helix/config/libhelixconfig.la \
$(top_builddir)/amarok/src/plugin/libplugin.la \
-lkdeui -lkdecore $(ALSALIB_LIBS)
-ltdeui -ltdecore $(ALSALIB_LIBS)
libamarok_helixengine_plugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)

@ -401,7 +401,7 @@ bool MasEngine::masinit()
warning() << "MAS daemon not running. Starting! Please provide password..." << endl;
// masd seems not to be running, let's try to run it
TQCString cmdline;
cmdline = TQFile::encodeName( KStandardDirs::findExe( TQString::tqfromLatin1( "kdesu" ) ) );
cmdline = TQFile::encodeName( KStandardDirs::findExe( TQString::tqfromLatin1( "tdesu" ) ) );
// TODO !!!hardcoded path
cmdline += " -n -f /usr/local/mas/log/mas-1.log -c ";
cmdline += "/usr/local/mas/bin/mas-launch";

@ -11,7 +11,7 @@ INCLUDES = \
libamarok_xine_engine_la_LIBADD = \
$(top_builddir)/amarok/src/libamarok.la \
$(top_builddir)/amarok/src/plugin/libplugin.la \
-lkdeui -lkdecore \
-ltdeui -ltdecore \
$(XINE_LIBS) $(LIB_QT)
libamarok_xine_engine_la_SOURCES = \

@ -283,7 +283,7 @@ void UniversalAmarok::noAmarokRunning() {
}
void UniversalAmarok::runAmarok() {
KApplication::kdeinitExecWait("amarok");
KApplication::tdeinitExecWait("amarok");
}

@ -23,6 +23,6 @@ link_directories(
tde_add_executable( amarok
SOURCES loader.cpp
LINK kdeui-shared
LINK tdeui-shared
DESTINATION ${BIN_INSTALL_DIR}
)

@ -10,7 +10,7 @@ amarok_LDADD = \
$(LIB_QT) \
$(LIB_KDEUI)
amarok_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
amarok_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
METASOURCES = AUTO

@ -12,7 +12,7 @@ libdaapreader_la_LIBADD = \
$(LIB_KDEUI) \
$(top_builddir)/amarok/src/mediadevice/daap/daapreader/authentication/libauthentication.la
libdaapreader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
libdaapreader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
METASOURCES = AUTO

@ -15,7 +15,7 @@ libauthentication_la_LIBADD = \
$(LIB_KDECORE) \
$(LIB_KDEUI)
libauthentication_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
libauthentication_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
METASOURCES = AUTO

@ -206,7 +206,7 @@ if [ -s "`kde-config --localprefix`/share/config/$RCFILE" -a "$RESET_CONF" != "1
done
HOW_ROOT="`ReadConfig how_root`"
if [ -z "$HOW_ROOT" ]; then #Save default value if empty
HOW_ROOT="kdesu"
HOW_ROOT="tdesu"
WriteConfig how_root "$HOW_ROOT"
fi
USE_ID="`ReadConfig use_id`"
@ -253,9 +253,9 @@ else
fi
## What to use to get root privileges for installation?
HOW_ROOT="`kdialog --radiolist \"How do you want Amarok-svn to get root privileges for the install/uninstall commands?\" kdesu \"With 'kdesu' (default, choose this if unsure)\" on sudo \"With 'sudo'\" off \"su -c\" \"With 'su -c'\" off`"
HOW_ROOT="`kdialog --radiolist \"How do you want Amarok-svn to get root privileges for the install/uninstall commands?\" tdesu \"With 'tdesu' (default, choose this if unsure)\" on sudo \"With 'sudo'\" off \"su -c\" \"With 'su -c'\" off`"
if [ -z "$HOW_ROOT" ]; then #Fallback if the user pressed cancel
HOW_ROOT="kdesu"
HOW_ROOT="tdesu"
fi
WriteConfig how_root "$HOW_ROOT"
@ -569,7 +569,7 @@ else
echo "(You probably have to enter the root password now.)"
su -c "bash $TMP_OLD_UNINFO"
else
kdesu -t bash $TMP_OLD_UNINFO
tdesu -t bash $TMP_OLD_UNINFO
fi
#No error check here because it seems to trigger even when there is no error, I can't figure out why...
#It doesn't matter much if this step fails anyway...
@ -589,7 +589,7 @@ elif [ "$HOW_ROOT" = "su -c" ]; then
echo "(You probably have to enter the root password now.)"
su -c "`which unsermake` install"
else
kdesu -t `which unsermake` install
tdesu -t `which unsermake` install
fi
if [ "$?" = "0" ]; then #If the command did finish successfully
#stopwatch.

@ -146,6 +146,6 @@ dcop --all-users amarok playlist popupMessage "Copying done. To add music to the
else
kdialog --title "Amarok livecd remaster" --sorry "You must run this script as root. Try running 'kdesu sh amarok.live.remaster.part1.sh' instead."
kdialog --title "Amarok livecd remaster" --sorry "You must run this script as root. Try running 'tdesu sh amarok.live.remaster.part1.sh' instead."
fi

@ -75,5 +75,5 @@ if [ `/usr/bin/whoami` = 'root' ]; then
else
kdialog --title "Amarok livecd remaster" --sorry "You must run this script as root. Try running 'kdesu sh amarok.live.remaster.part1.sh' instead."
kdialog --title "Amarok livecd remaster" --sorry "You must run this script as root. Try running 'tdesu sh amarok.live.remaster.part1.sh' instead."
fi

@ -145,7 +145,7 @@ class ConfigDialog ( QDialog ):
fd.close()
path, iso = self.readConfig()
os.system("kdesu -t sh %s/amarok.live.remaster.part1.sh %s %s" % (scriptdir, path, iso))
os.system("tdesu -t sh %s/amarok.live.remaster.part1.sh %s %s" % (scriptdir, path, iso))
#os.wait()
print "got path: %s" % path
@ -377,7 +377,7 @@ class Remasterer( QApplication ):
scriptdir = kdedir + "/share/apps/amarok/scripts/amarok_live"
fd.close()
os.system("kdesu sh %s/amarok.live.remaster.part2.sh %s" % (scriptdir, path))
os.system("tdesu sh %s/amarok.live.remaster.part2.sh %s" % (scriptdir, path))
fd = open("/tmp/amarok.script", 'r')
y = fd.readline()

@ -134,6 +134,6 @@ fi
else
kdialog --title "amaroK livecd remaster" --sorry "You must run this script as root. Try running 'kdesu sh amarok.live.remaster.part1.sh' instead."
kdialog --title "amaroK livecd remaster" --sorry "You must run this script as root. Try running 'tdesu sh amarok.live.remaster.part1.sh' instead."
fi

@ -58,6 +58,6 @@ if [ `/usr/bin/whoami` = 'root' ]; then
else
kdialog --title "amaroK livecd remaster" --sorry "You must run this script as root. Try running 'kdesu sh amarok.live.remaster.part1.sh' instead."
kdialog --title "amaroK livecd remaster" --sorry "You must run this script as root. Try running 'tdesu sh amarok.live.remaster.part1.sh' instead."
fi

@ -21,7 +21,7 @@ graphequalizer_LDADD = \
$(LIB_KDEUI) \
$(LIB_KDECORE)
graphequalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
graphequalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
METASOURCES = AUTO

@ -235,7 +235,7 @@ Amarok::TrayIcon::blendOverlay( TQPixmap &sourcePixmap )
if ( !overlayVisible || !overlay || overlay->isNull() )
return setPixmap( sourcePixmap ); // @since 3.2
// here comes the tricky part.. no kdefx functions are helping here.. :-(
// here comes the tricky part.. no tdefx functions are helping here.. :-(
// we have to blend pixmaps with different sizes (blending will be done in
// the bottom-left corner of source pixmap with a smaller overlay pixmap)
int opW = overlay->width(),

Loading…
Cancel
Save