Rename a few build variables for overall consistency

11 years ago · 3c7f8593b2
parent d7980e6978
commit 3c7f8593b2
14 changed files with 18 additions and 18 deletions
--- a/buildtools/autotools/tdefilednddetailview.h
+++ b/buildtools/autotools/tdefilednddetailview.h
@ -15,8 +15,8 @@
 *                                                                        *
 **************************************************************************/

-#ifndef KFILEDNDDETAILVIEW_H
-#define KFILEDNDDETAILVIEW_H
+#ifndef TDEFILEDNDDETAILVIEW_H
+#define TDEFILEDNDDETAILVIEW_H

 //////////////////////////////////////////////////////////////////////
 // TQt specific include files
--- a/buildtools/autotools/tdefiledndiconview.h
+++ b/buildtools/autotools/tdefiledndiconview.h
@ -15,8 +15,8 @@
 *                                                                        *
 **************************************************************************/

-#ifndef KFILEDNDICONVIEW_H
-#define KFILEDNDICONVIEW_H
+#ifndef TDEFILEDNDICONVIEW_H
+#define TDEFILEDNDICONVIEW_H

 #include <tqwidget.h>
 #include <tqtimer.h> 
--- a/doc/tdevelop/project-management.docbook
+++ b/doc/tdevelop/project-management.docbook
@ -261,7 +261,7 @@ INCLUDES = $(all_includes)
 myapp_LDFLAGS = $(KDE_RPATH) $(all_libraries)

 # the libraries to link against.
-myapp_LDADD   = $(LIB_KFILE) $(LIB_TDEPRINT)
+myapp_LDADD   = $(LIB_TDEFILE) $(LIB_TDEPRINT)

 # which sources should be compiled for myapp
 myapp_SOURCES = main.cpp myapp.cpp myappview.cpp
--- a/kdevdesigner/designer/Makefile.am
+++ b/kdevdesigner/designer/Makefile.am
@ -9,7 +9,7 @@ kde_module_LTLIBRARIES =  libkdevdesignerpart.la
 libkdevdesignerpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
 libkdevdesignerpart_la_LIBADD = \
 	$(top_builddir)/kdevdesigner/uilib/libkdevqui.la $(top_builddir)/kdevdesigner/shared/libshared.la \
-	$(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -lqassistantclient $(LIB_KFILE) $(LIB_KPARTS)
+	$(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -lqassistantclient $(LIB_TDEFILE) $(LIB_KPARTS)
 libkdevdesignerpart_la_SOURCES = kdevdesigner_part.cpp actiondnd.cpp actioneditorimpl.cpp actionlistview.cpp asciivalidator.cpp command.cpp connectionitems.cpp connectiontable.cpp customwidgeteditorimpl.cpp database.cpp dbconnectionimpl.cpp dbconnectionsimpl.cpp defs.cpp designerapp.cpp designerappiface.cpp editfunctionsimpl.cpp filechooser.cpp formfile.cpp formsettingsimpl.cpp formwindow.cpp hierarchyview.cpp iconvieweditorimpl.cpp layout.cpp listboxdnd.cpp listboxeditorimpl.cpp listboxrename.cpp listdnd.cpp listviewdnd.cpp listvieweditorimpl.cpp mainwindow.cpp mainwindowactions.cpp menubareditor.cpp metadatabase.cpp multilineeditorimpl.cpp newformimpl.cpp orderindicator.cpp outputwindow.cpp paletteeditoradvancedimpl.cpp paletteeditorimpl.cpp pixmapchooser.cpp pixmapcollection.cpp popupmenueditor.cpp previewframe.cpp previewwidgetimpl.cpp project.cpp projectsettingsimpl.cpp propertyeditor.cpp propertyobject.cpp qcompletionedit.cpp resource.cpp sizehandle.cpp sourceeditor.cpp sourcefile.cpp startdialogimpl.cpp styledbutton.cpp syntaxhighlighter_html.cpp tableeditorimpl.cpp timestamp.cpp variabledialogimpl.cpp widgetaction.cpp widgetfactory.cpp wizardeditorimpl.cpp workspace.cpp about.ui dbconnection.ui gotolinedialog.ui newform.ui previewwidget.ui variabledialog.ui actioneditor.ui dbconnectioneditor.ui iconvieweditor.ui paletteeditor.ui projectsettings.ui wizardeditor.ui configtoolboxdialog.ui dbconnections.ui listboxeditor.ui paletteeditoradvanced.ui replacedialog.ui connectiondialog.ui editfunctions.ui listeditor.ui pixmapcollectioneditor.ui richtextfontdialog.ui createtemplate.ui finddialog.ui listvieweditor.ui pixmapfunction.ui startdialog.ui customwidgeteditor.ui formsettings.ui multilineeditor.ui preferences.ui tableeditor.ui designeraction.cpp myiconloader.cpp
 partrcdir = $(kde_datadir)/kdevdesignerpart
 partdesktopdir = $(kde_servicesdir)
--- a/languages/cpp/app_templates/kapp/src-Makefile.am
+++ b/languages/cpp/app_templates/kapp/src-Makefile.am
@ -11,7 +11,7 @@ INCLUDES         = $(all_includes)
 %{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KIO)

 # the libraries to link against.
-%{APPNAMELC}_LDADD   = $(LIB_KFILE) $(LIB_TDEPRINT)
+%{APPNAMELC}_LDADD   = $(LIB_TDEFILE) $(LIB_TDEPRINT)

 # which sources should be compiled for %{APPNAMELC}
 %{APPNAMELC}_SOURCES = main.cpp %{APPNAMELC}.cpp %{APPNAMELC}view.cpp \
--- a/languages/cpp/app_templates/konqnavpanel/src-Makefile.am
+++ b/languages/cpp/app_templates/konqnavpanel/src-Makefile.am
@ -5,7 +5,7 @@ kde_module_LTLIBRARIES=konqsidebar_%{APPNAMELC}.la

 konqsidebar_%{APPNAMELC}_la_SOURCES = %{APPNAMELC}.cpp
 konqsidebar_%{APPNAMELC}_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) -lkonqsidebarplugin
-konqsidebar_%{APPNAMELC}_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE)
+konqsidebar_%{APPNAMELC}_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEFILE)

 %{APPNAMELC}_entry_DATA = %{APPNAMELC}.desktop
 %{APPNAMELC}_entrydir = $(kde_datadir)/konqsidebartng/entries
--- a/languages/cpp/app_templates/kpartapp/src-Makefile.am
+++ b/languages/cpp/app_templates/kpartapp/src-Makefile.am
@ -42,7 +42,7 @@ kde_module_LTLIBRARIES = lib%{APPNAMELC}part.la
 # the Part's source, library search path, and link libraries
 lib%{APPNAMELC}part_la_SOURCES = %{APPNAMELC}_part.cpp
 lib%{APPNAMELC}part_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KIO)
-lib%{APPNAMELC}part_la_LIBADD  = $(LIB_KPARTS) $(LIB_KFILE)
+lib%{APPNAMELC}part_la_LIBADD  = $(LIB_KPARTS) $(LIB_TDEFILE)

 # this is where the desktop file will go 
 partdesktopdir   = $(kde_servicesdir)
--- a/languages/cpp/app_templates/kxt/src-Makefile.am
+++ b/languages/cpp/app_templates/kxt/src-Makefile.am
@ -14,7 +14,7 @@ METASOURCES = AUTO
 %{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)

 # the libraries to link against.
-%{APPNAMELC}_LDADD   = $(LIB_KFILE) $(LIB_TDEPRINT)
+%{APPNAMELC}_LDADD   = $(LIB_TDEFILE) $(LIB_TDEPRINT)

 # which sources should be compiled for %{APPNAMELC}
 %{APPNAMELC}_SOURCES = settings.kcfgc main.cpp %{APPNAMELC}.cpp %{APPNAMELC}view.cpp \
--- a/languages/cpp/app_templates/noatunui/src-Makefile.am
+++ b/languages/cpp/app_templates/noatunui/src-Makefile.am
@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = noatun_%{APPNAMELC}plugin.la

 noatun_%{APPNAMELC}plugin_la_SOURCES = plugin_%{APPNAMELC}.cpp plugin_%{APPNAMELC}_impl.cpp
 noatun_%{APPNAMELC}plugin_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
-noatun_%{APPNAMELC}plugin_la_LIBADD = $(LIB_KFILE) -lnoatun -lnoatuncontrols \
+noatun_%{APPNAMELC}plugin_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lnoatuncontrols \
                                    -lqtmcop -lkmedia2_idl -lsoundserver_idl

 noinst_HEADERS = plugin_%{APPNAMELC}_impl.h
--- a/languages/cpp/app_templates/noatunvisual/src-Makefile.am
+++ b/languages/cpp/app_templates/noatunvisual/src-Makefile.am
@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = noatun_%{APPNAMELC}plugin.la
 noatun_%{APPNAMELC}plugin_la_SOURCES = plugin_%{APPNAMELC}.cpp plugin_%{APPNAMELC}_impl.cpp
 noatun_%{APPNAMELC}plugin_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(LIBSDL_RPATH) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
 noatun_%{APPNAMELC}plugin_la_CXXFLAGS = $(LIBSDL_CFLAGS)
-noatun_%{APPNAMELC}plugin_la_LIBADD = $(LIB_KFILE) $(LIBSDL_LIBS) -lnoatun -lm
+noatun_%{APPNAMELC}plugin_la_LIBADD = $(LIB_TDEFILE) $(LIBSDL_LIBS) -lnoatun -lm

 pluginsdir = $(kde_datadir)/noatun
 plugins_DATA = %{APPNAMELC}.plugin
--- a/languages/cpp/app_templates/tdeconfig35/src-Makefile.am
+++ b/languages/cpp/app_templates/tdeconfig35/src-Makefile.am
@ -14,7 +14,7 @@ METASOURCES = AUTO
 %{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries)

 # the libraries to link against.
-%{APPNAMELC}_LDADD   = $(LIB_KFILE) $(LIB_TDEPRINT)
+%{APPNAMELC}_LDADD   = $(LIB_TDEFILE) $(LIB_TDEPRINT)

 # which sources should be compiled for %{APPNAMELC}
 %{APPNAMELC}_SOURCES = settings.kcfgc main.cpp %{APPNAMELC}.cpp %{APPNAMELC}view.cpp \
--- a/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.h
+++ b/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.h
@ -1,7 +1,7 @@
 %{H_TEMPLATE}

-#ifndef __KFILE_%{APPNAMEUC}_H__
-#define __KFILE_%{APPNAMEUC}_H__
+#ifndef __TDEFILE_%{APPNAMEUC}_H__
+#define __TDEFILE_%{APPNAMEUC}_H__

 /**
 * Note: For further information look into <$TDEDIR/include/tdefilemetainfo.h>
@ -21,5 +21,5 @@ public:
    virtual bool readInfo( KFileMetaInfo& info, uint what);
 };

-#endif // __KFILE_%{APPNAMEUC}_H__
+#endif // __TDEFILE_%{APPNAMEUC}_H__

--- a/languages/ruby/app_templates/kapp/src-Makefile.am
+++ b/languages/ruby/app_templates/kapp/src-Makefile.am
@ -11,7 +11,7 @@ INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR)
 %{APPNAMELC}_LDFLAGS = $(all_libraries) $(KDE_RPATH) -L$(RUBY_LIBDIR)

 # the libraries to link against.
-%{APPNAMELC}_LDADD = $(LIB_KFILE) $(LIB_TDEPRINT) $(RUBY_LIBRUBYARG)
+%{APPNAMELC}_LDADD = $(LIB_TDEFILE) $(LIB_TDEPRINT) $(RUBY_LIBRUBYARG)

 # which sources should be compiled for %{APPNAMELC}
 %{APPNAMELC}_SOURCES = %{APPNAMELC}.cpp
--- a/languages/ruby/app_templates/kxt/src-Makefile.am
+++ b/languages/ruby/app_templates/kxt/src-Makefile.am
@ -11,7 +11,7 @@ INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR)
 %{APPNAMELC}_LDFLAGS = $(all_libraries) $(KDE_RPATH) -L$(RUBY_LIBDIR)

 # the libraries to link against.
-%{APPNAMELC}_LDADD = $(LIB_KFILE) $(LIB_TDEPRINT) $(RUBY_LIBRUBYARG)
+%{APPNAMELC}_LDADD = $(LIB_TDEFILE) $(LIB_TDEPRINT) $(RUBY_LIBRUBYARG)

 # which sources should be compiled for %{APPNAMELC}
 %{APPNAMELC}_SOURCES = %{APPNAMELC}.cpp