diff options
author | Timothy Pearson <[email protected]> | 2011-11-06 02:23:44 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-11-06 02:23:44 -0600 |
commit | a04dbd1e2735821fb7d16e5ef20f39d382d903ee (patch) | |
tree | e1fca5899de071b8340f2ba7c09ba7a98fc3e539 | |
parent | e15212381e3def7fcf5c03cf215223e1f487ccac (diff) | |
download | tellico-a04dbd1e2735821fb7d16e5ef20f39d382d903ee.tar.gz tellico-a04dbd1e2735821fb7d16e5ef20f39d382d903ee.zip |
Additional kde to tde renaming
-rw-r--r-- | acinclude.m4 | 26 | ||||
-rw-r--r-- | doc/en/index.docbook | 2 | ||||
-rw-r--r-- | doc/fr/index.docbook | 2 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/calendarhandler.cpp | 2 | ||||
-rw-r--r-- | src/filterdialog.h | 2 | ||||
-rw-r--r-- | src/gui/datewidget.cpp | 2 | ||||
-rw-r--r-- | src/gui/lineedit.cpp | 4 | ||||
-rw-r--r-- | src/mainwindow.cpp | 2 |
9 files changed, 22 insertions, 22 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 79afd1f..e61b044 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -377,7 +377,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) @@ -721,7 +721,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 @@ -2069,12 +2069,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") @@ -2083,9 +2083,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") @@ -2094,8 +2094,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") @@ -2104,10 +2104,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)") @@ -2494,7 +2494,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 ]) diff --git a/doc/en/index.docbook b/doc/en/index.docbook index 1f4eeb4..8cbae31 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -335,7 +335,7 @@ Updates and news can be found there.</para> <!-- List any special requirements for your application here. This should include: -.Libraries or other software that is not included in kdesupport, +.Libraries or other software that is not included in tdesupport, kdelibs, or kdebase. .Hardware requirements like amount of RAM, disk space, graphics card capabilities, screen resolution, special expansion cards, etc. diff --git a/doc/fr/index.docbook b/doc/fr/index.docbook index 7d41871..1de7d0d 100644 --- a/doc/fr/index.docbook +++ b/doc/fr/index.docbook @@ -357,7 +357,7 @@ Les mises à jour et les nouvelles informations s'y trouvent.</para> <!-- List any special requirements for your application here. This should include: -.Libraries or other software that is not included in kdesupport, +.Libraries or other software that is not included in tdesupport, kdelibs, or kdebase. .Hardware requirements like amount of RAM, disk space, graphics card capabilities, screen resolution, special expansion cards, etc. diff --git a/src/Makefile.am b/src/Makefile.am index 1768a24..64bc01c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -122,7 +122,7 @@ KDE_OPTIONS = noautodist CLEANFILES = *~ *.loT # the library search path. -tellico_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) +tellico_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) uidir = $(kde_datadir)/tellico ui_DATA = tellicoui.rc diff --git a/src/calendarhandler.cpp b/src/calendarhandler.cpp index 5a88ac8..303bad1 100644 --- a/src/calendarhandler.cpp +++ b/src/calendarhandler.cpp @@ -31,7 +31,7 @@ #include <unistd.h> #include <limits.h> -// most of this code came from konsolekalendar in kdepim +// most of this code came from konsolekalendar in tdepim using Tellico::CalendarHandler; diff --git a/src/filterdialog.h b/src/filterdialog.h index 26509ba..d12b5f0 100644 --- a/src/filterdialog.h +++ b/src/filterdialog.h @@ -14,7 +14,7 @@ #ifndef FILTERDIALOG_H #define FILTERDIALOG_H -// kwidgetlister is copied from kdepim/libkdenetwork cvs +// kwidgetlister is copied from tdepim/libkdenetwork cvs #include "gui/kwidgetlister.h" #include "filter.h" #include "datavectors.h" diff --git a/src/gui/datewidget.cpp b/src/gui/datewidget.cpp index a8cc726..c43ca26 100644 --- a/src/gui/datewidget.cpp +++ b/src/gui/datewidget.cpp @@ -11,7 +11,7 @@ * * ***************************************************************************/ -// this class borrows heavily from kdateedit.h in the kdepim module +// this class borrows heavily from kdateedit.h in the tdepim module // which is Copyright (c) 2002 Cornelius Schumacher <[email protected]> // and published under the LGPL diff --git a/src/gui/lineedit.cpp b/src/gui/lineedit.cpp index e5da745..cca7f7d 100644 --- a/src/gui/lineedit.cpp +++ b/src/gui/lineedit.cpp @@ -77,11 +77,11 @@ void LineEdit::drawContents(TQPainter* painter_) { // save current pen TQPen oldPen = painter_->pen(); - // follow lead of kdepim and amarok, use disabled text color + // follow lead of tdepim and amarok, use disabled text color painter_->setPen(palette().color(TQPalette::Disabled, TQColorGroup::Text)); TQRect rect = contentsRect(); - // again, follow kdepim and amarok lead, and pad by 2 pixels + // again, follow tdepim and amarok lead, and pad by 2 pixels rect.rLeft() += 2; painter_->drawText(rect, AlignAuto | AlignVCenter, m_hint); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index c6b8dfb..6d580b9 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -743,7 +743,7 @@ void MainWindow::initActions() { actionCollection(), "quick_filter_clear"); m_quickFilter = new GUI::LineEdit(); - m_quickFilter->setHint(i18n("Filter here...")); // same text as kdepim and amarok + m_quickFilter->setHint(i18n("Filter here...")); // same text as tdepim and amarok // about 10 characters wide m_quickFilter->setFixedWidth(m_quickFilter->fontMetrics().maxWidth()*10); // want to update every time the filter text changes |