diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 19:57:00 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 19:57:00 +0200 |
| commit | 7728fb7c70b281c817b9a49bd499abda882b076b (patch) | |
| tree | 9070ee9a32dcd2b6e0495b6fc596867fad4dd3ae /src | |
| parent | 6b734218e2765019caf6659e1ffefd0050d12800 (diff) | |
| download | kdiff3-7728fb7c70b281c817b9a49bd499abda882b076b.tar.gz kdiff3-7728fb7c70b281c817b9a49bd499abda882b076b.zip | |
Additional k => tde renaming and fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/fileaccess.cpp | 2 | ||||
| -rw-r--r-- | src/main.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index a73b52e..253e723 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,8 +25,8 @@ bin_PROGRAMS = kdiff3 # the application source, library search path, and link libraries kdiff3_SOURCES = main.cpp kdiff3_shell.cpp -kdiff3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kdiff3_LDADD = $(LIB_KPARTS) +kdiff3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kdiff3_LDADD = $(LIB_TDEPARTS) # this is where the desktop file will go shelldesktopdir = $(kde_appsdir)/Development @@ -47,7 +47,7 @@ libkdiff3part_la_SOURCES = kdiff3_part.cpp kdiff3.cpp directorymergewindow.cpp \ mergeresultwindow.cpp fileaccess.cpp gnudiff_analyze.cpp gnudiff_io.cpp gnudiff_xmalloc.cpp \ common.cpp smalldialogs.cpp libkdiff3part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -libkdiff3part_la_LIBADD = $(LIB_TDEPRINT) $(LIB_KPARTS) $(LIB_TDEFILE) +libkdiff3part_la_LIBADD = $(LIB_TDEPRINT) $(LIB_TDEPARTS) $(LIB_TDEFILE) # this is where the desktop file will go partdesktopdir = $(kde_servicesdir) diff --git a/src/fileaccess.cpp b/src/fileaccess.cpp index 6946232..0dc0511 100644 --- a/src/fileaccess.cpp +++ b/src/fileaccess.cpp @@ -887,7 +887,7 @@ bool FileAccessJobHandler::copyFile( const TQString& dest ) i18n("Copying file: %1 -> %2").arg(m_pFileAccess->prettyAbsPath()).arg(dest) ); return m_bSuccess; - // Note that the KIO-slave preserves the original date, if this is supported. + // Note that the TDEIO-slave preserves the original date, if this is supported. } // Both files are local: diff --git a/src/main.cpp b/src/main.cpp index fee9f0e..66aad10 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -178,7 +178,7 @@ int main(int argc, char *argv[]) aboutData.addCredit("Sebastien Fricker", "Windows installer" ); aboutData.addCredit("Stephan Binner", "i18n-help", "binner" "@" "kde.org" ); aboutData.addCredit("Stefan Partheymueller", "Clipboard-patch" ); - aboutData.addCredit("David Faure", "KIO-Help", "faure" "@" "kde.org" ); + aboutData.addCredit("David Faure", "TDEIO-Help", "faure" "@" "kde.org" ); aboutData.addCredit("Bernd Gehrmann", "Class CvsIgnoreList from Cervisia" ); aboutData.addCredit("Andre Woebbeking", "Class StringMatcher" ); aboutData.addCredit("Michael Denio", "Directory Equality-Coloring patch"); |