diff options
36 files changed, 44 insertions, 44 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index dae26834..158801bd 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -11,7 +11,7 @@ # required stuff -tde_setup_architecture_flags( ) +tde_setup_compiler_flags( ) include(TestBigEndian) test_big_endian(WORDS_BIGENDIAN) diff --git a/doc/kdearch/index.docbook b/doc/kdearch/index.docbook index 8bd2bc93..517d90b0 100644 --- a/doc/kdearch/index.docbook +++ b/doc/kdearch/index.docbook @@ -155,7 +155,7 @@ Access to simple, non-hierarchical configuration files. </para> </formalpara></listitem> -<listitem><formalpara><title><ulink url="kdeapi:tdecore/KDesktopFile">KDesktopFile</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdecore/TDEDesktopFile">TDEDesktopFile</ulink></title> <para> Access to <literal>.desktop</literal> files. </para> diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp index b2c10f03..22add7fd 100644 --- a/kdevdesigner/designer/kdevdesigner_part.cpp +++ b/kdevdesigner/designer/kdevdesigner_part.cpp @@ -20,7 +20,7 @@ #include "kdevdesigner_part.h" -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaction.h> #include <tdeactionclasses.h> #include <kstdaction.h> diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp index db665500..7b1a327d 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp @@ -5,7 +5,7 @@ #include <%{APPNAMELC}_factory.h> #include <%{APPNAMELC}_part.h> #include <%{APPNAMELC}_aboutdata.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kiconloader.h> #include <tdelocale.h> #include <kdebug.h> diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp index 48876c9a..7f85ba3e 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp @@ -1,6 +1,6 @@ #include <tqlabel.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tqstring.h> #include <tqwidget.h> diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h index aedddf27..d415b838 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h @@ -20,7 +20,7 @@ public: /** * Construct a @ref KonqSidebarPlugin. * - * @param inst The sidebar's kinstance class. + * @param inst The sidebar's tdeinstance class. * @param parent The sidebar internal button info class responsible for this plugin. * @param widgetParent The container which will contain the plugins widget. * @param desktopName The filename of the configuration file. diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp index 21681fcd..6365ef3b 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.cpp +++ b/languages/cpp/app_templates/kpartapp/app_part.cpp @@ -1,7 +1,7 @@ #include "%{APPNAMELC}_part.h" -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaction.h> #include <kstdaction.h> #include <tdefiledialog.h> diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp index ecda7fb0..dc1a72d2 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp @@ -3,7 +3,7 @@ #include <tdehtml_part.h> #include <tdeaction.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdemessagebox.h> #include <tdelocale.h> #include <tdeglobal.h> diff --git a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp index 4c12b424..bcd8563c 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp +++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp @@ -3,7 +3,7 @@ #include "%{APPNAMELC}_part.h" #include <tdeparts/genericfactory.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaction.h> #include <kstdaction.h> #include <tdefiledialog.h> diff --git a/languages/cpp/app_templates/tdeioslave/slave.cpp b/languages/cpp/app_templates/tdeioslave/slave.cpp index 9c6d3883..03bba9de 100644 --- a/languages/cpp/app_templates/tdeioslave/slave.cpp +++ b/languages/cpp/app_templates/tdeioslave/slave.cpp @@ -14,7 +14,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdemessagebox.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include <tdestandarddirs.h> #include <tdelocale.h> diff --git a/languages/cpp/cppsupportfactory.cpp b/languages/cpp/cppsupportfactory.cpp index e9141673..a4a64ae0 100644 --- a/languages/cpp/cppsupportfactory.cpp +++ b/languages/cpp/cppsupportfactory.cpp @@ -9,7 +9,7 @@ * * ***************************************************************************/ -#include <kinstance.h> +#include <tdeinstance.h> #include <tdestandarddirs.h> #include <kdevplugininfo.h> #include "cppsupportfactory.h" diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp index eed450b8..00fce53b 100644 --- a/languages/cpp/createpcsdialog.cpp +++ b/languages/cpp/createpcsdialog.cpp @@ -29,7 +29,7 @@ #include <kiconloader.h> #include <tdelistview.h> #include <tdeapplication.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdestandarddirs.h> #include <tdelocale.h> #include <kstringhandler.h> diff --git a/languages/csharp/csharpdoc.cpp b/languages/csharp/csharpdoc.cpp index 0611bc19..1438446e 100644 --- a/languages/csharp/csharpdoc.cpp +++ b/languages/csharp/csharpdoc.cpp @@ -9,7 +9,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdestandarddirs.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeprocess.h> #include <tdeversion.h> #include <tdeglobal.h> diff --git a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp index 6e019589..4e7efd73 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp +++ b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include "pgioptionsplugin.h" #include "pgioptionsfactory.h" diff --git a/languages/java/javasupportfactory.cpp b/languages/java/javasupportfactory.cpp index 1e2b091d..7757991e 100644 --- a/languages/java/javasupportfactory.cpp +++ b/languages/java/javasupportfactory.cpp @@ -9,7 +9,7 @@ * * ***************************************************************************/ -#include <kinstance.h> +#include <tdeinstance.h> #include <tdestandarddirs.h> #include <kdevplugininfo.h> #include "javasupportfactory.h" diff --git a/languages/perl/perldoc.cpp b/languages/perl/perldoc.cpp index 17843ca8..63a23af5 100644 --- a/languages/perl/perldoc.cpp +++ b/languages/perl/perldoc.cpp @@ -9,7 +9,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdestandarddirs.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeprocess.h> #include <tdeversion.h> #include <tdeglobal.h> diff --git a/languages/php/phpcodecompletion.cpp b/languages/php/phpcodecompletion.cpp index f514496f..0a286653 100644 --- a/languages/php/phpcodecompletion.cpp +++ b/languages/php/phpcodecompletion.cpp @@ -22,7 +22,7 @@ #include "phpconfigdata.h" #include <kdevcore.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdestandarddirs.h> #include <kdebug.h> diff --git a/languages/php/phpnewclassdlg.cpp b/languages/php/phpnewclassdlg.cpp index 890369bd..58316af2 100644 --- a/languages/php/phpnewclassdlg.cpp +++ b/languages/php/phpnewclassdlg.cpp @@ -25,7 +25,7 @@ #include <tqtextedit.h> #include <tdeglobal.h> #include <tdestandarddirs.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> using namespace std; diff --git a/languages/python/pydoc.cpp b/languages/python/pydoc.cpp index fed6fa7f..489cdb35 100644 --- a/languages/python/pydoc.cpp +++ b/languages/python/pydoc.cpp @@ -7,7 +7,7 @@ #include <tqtextstream.h> #include <tdestandarddirs.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeprocess.h> #include <tdeversion.h> #include <tdeglobal.h> diff --git a/languages/ruby/app_templates/dcopservice/app.cpp b/languages/ruby/app_templates/dcopservice/app.cpp index 2d68ecbc..09d2f1fa 100644 --- a/languages/ruby/app_templates/dcopservice/app.cpp +++ b/languages/ruby/app_templates/dcopservice/app.cpp @@ -2,7 +2,7 @@ #include <tqstring.h> #include <tqfileinfo.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdestandarddirs.h> int main(int argc, char **argv) { diff --git a/languages/ruby/app_templates/kapp/app.cpp b/languages/ruby/app_templates/kapp/app.cpp index 2d68ecbc..09d2f1fa 100644 --- a/languages/ruby/app_templates/kapp/app.cpp +++ b/languages/ruby/app_templates/kapp/app.cpp @@ -2,7 +2,7 @@ #include <tqstring.h> #include <tqfileinfo.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdestandarddirs.h> int main(int argc, char **argv) { diff --git a/languages/ruby/app_templates/kxt/app.cpp b/languages/ruby/app_templates/kxt/app.cpp index 2d68ecbc..09d2f1fa 100644 --- a/languages/ruby/app_templates/kxt/app.cpp +++ b/languages/ruby/app_templates/kxt/app.cpp @@ -2,7 +2,7 @@ #include <tqstring.h> #include <tqfileinfo.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdestandarddirs.h> int main(int argc, char **argv) { diff --git a/lib/util/tdescriptactionmanager.cpp b/lib/util/tdescriptactionmanager.cpp index 3007abc7..f67a289c 100644 --- a/lib/util/tdescriptactionmanager.cpp +++ b/lib/util/tdescriptactionmanager.cpp @@ -21,7 +21,7 @@ #include <tdeparts/part.h> #include <tdeparts/componentfactory.h> #include <tdeapplication.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdestandarddirs.h> #include <tdelocale.h> @@ -40,9 +40,9 @@ KScriptAction::KScriptAction( const TQString &scriptDesktopFile, TQObject *inter m_isValid = false; m_refs = 0; // Read the desktop file - if(KDesktopFile::isDesktopFile(scriptDesktopFile)) + if(TDEDesktopFile::isDesktopFile(scriptDesktopFile)) { - KDesktopFile desktop(scriptDesktopFile, true); + TDEDesktopFile desktop(scriptDesktopFile, true); TQFileInfo scriptPath(scriptDesktopFile); m_scriptFile = scriptPath.dirPath(true) + "/" + desktop.readEntry("X-TDE-ScriptName", ""); diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp index 297d802c..38b1965e 100644 --- a/parts/appwizard/importdlg.cpp +++ b/parts/appwizard/importdlg.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <kdialog.h> #include <tdefiledialog.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <tdemessagebox.h> #include <tdestandarddirs.h> diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp index 18a5d686..9d1951be 100644 --- a/parts/classview/classviewwidget.cpp +++ b/parts/classview/classviewwidget.cpp @@ -23,7 +23,7 @@ #include "classviewwidget.h" #include <kiconloader.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kurl.h> #include <tdeaction.h> #include <tdeactionclasses.h> diff --git a/parts/documentation/protocols/chm/chm.cpp b/parts/documentation/protocols/chm/chm.cpp index 787a8f32..840982ba 100644 --- a/parts/documentation/protocols/chm/chm.cpp +++ b/parts/documentation/protocols/chm/chm.cpp @@ -26,7 +26,7 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include <kurl.h> #include <kmimemagic.h> diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp index b21b6c55..d182315b 100644 --- a/parts/documentation/protocols/chm/kchmpart.cpp +++ b/parts/documentation/protocols/chm/kchmpart.cpp @@ -17,7 +17,7 @@ #include "kchmpart.h" #include <tqstring.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include <kdebug.h> #include <tdelocale.h> diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp index 6dff8e9f..f4287262 100644 --- a/parts/outputviews/makewidget.cpp +++ b/parts/outputviews/makewidget.cpp @@ -28,7 +28,7 @@ #include <tdeprocess.h> #include <tdeglobal.h> #include <tdestandarddirs.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kstatusbar.h> #include <tdeapplication.h> #include <tdeconfig.h> diff --git a/parts/partexplorer/partexplorer_plugin.cpp b/parts/partexplorer/partexplorer_plugin.cpp index 9741c6aa..86ed8306 100644 --- a/parts/partexplorer/partexplorer_plugin.cpp +++ b/parts/partexplorer/partexplorer_plugin.cpp @@ -11,7 +11,7 @@ #include "partexplorer_plugin.h" -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <kdevgenericfactory.h> #include <kdebug.h> diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp index 784c4ce9..cd587e96 100644 --- a/parts/tools/kapplicationtree.cpp +++ b/parts/tools/kapplicationtree.cpp @@ -36,7 +36,7 @@ #include <tdeapplication.h> #include <kbuttonbox.h> #include <kcombobox.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kdialog.h> #include <tdeglobal.h> #include <klineedit.h> diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp index 8dabccbd..66fd442b 100644 --- a/parts/tools/tools_part.cpp +++ b/parts/tools/tools_part.cpp @@ -11,7 +11,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kdialogbase.h> #include <kiconloader.h> #include <tdelocale.h> @@ -98,7 +98,7 @@ void ToolsPart::updateMenu() { TQString name = *it; - KDesktopFile df(name, true); + TDEDesktopFile df(name, true); if (df.readName().isNull()) continue; @@ -183,7 +183,7 @@ void ToolsPart::updateToolsMenu() this, TQ_SLOT(toolsMenuActivated()), (TQObject*) 0, menutext.utf8()); if (isdesktopfile) { - KDesktopFile df(config->readPathEntry("CommandLine")); + TDEDesktopFile df(config->readPathEntry("CommandLine")); action->setIcon(df.readIcon()); } actions.append(action); diff --git a/parts/tools/toolsconfig.cpp b/parts/tools/toolsconfig.cpp index adb2ab2f..bedbd59f 100644 --- a/parts/tools/toolsconfig.cpp +++ b/parts/tools/toolsconfig.cpp @@ -8,7 +8,7 @@ #include <tqheader.h> #include <tdeapplication.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kdialog.h> #include <kiconloader.h> #include <tdelocale.h> @@ -100,7 +100,7 @@ void ToolsConfig::fill() void ToolsConfig::add(const TQString &desktopFile) { - KDesktopFile df(desktopFile, true); + TDEDesktopFile df(desktopFile, true); if (df.readName().isEmpty()) return; diff --git a/parts/tools/toolsconfigwidget.cpp b/parts/tools/toolsconfigwidget.cpp index 22d705c2..bfc9efbe 100644 --- a/parts/tools/toolsconfigwidget.cpp +++ b/parts/tools/toolsconfigwidget.cpp @@ -19,7 +19,7 @@ #include <tdeconfig.h> #include <tdeversion.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kiconloader.h> #include <tdemessagebox.h> #include <kurl.h> @@ -113,7 +113,7 @@ void ToolsConfigWidget::fillListBox(TQListBox *lb, const TQDict<ToolsConfigEntry for (; it.current(); ++it) { ToolsConfigEntry *entry = it.current(); if (entry->isdesktopfile) { - KDesktopFile df(entry->cmdline); + TDEDesktopFile df(entry->cmdline); lb->insertItem(SmallIcon(df.readIcon()), entry->menutext); } else { lb->insertItem(entry->menutext); @@ -259,8 +259,8 @@ bool ToolsConfigWidget::eventFilter(TQObject *o, TQEvent *e) if (KURLDrag::decode(de, fileList)) { KURL::List::ConstIterator it; for (it = fileList.begin(); it != fileList.end(); ++it) { - if ((*it).isLocalFile() && KDesktopFile::isDesktopFile((*it).path())) { - KDesktopFile df((*it).path()); + if ((*it).isLocalFile() && TDEDesktopFile::isDesktopFile((*it).path())) { + TDEDesktopFile df((*it).path()); ToolsConfigEntry *entry = new ToolsConfigEntry; entry->menutext = df.readName(); entry->cmdline = (*it).path(); diff --git a/src/projectsession.cpp b/src/projectsession.cpp index 272258dd..d4a011de 100644 --- a/src/projectsession.cpp +++ b/src/projectsession.cpp @@ -24,7 +24,7 @@ #include <kurl.h> #include <tdemessagebox.h> #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdetexteditor/viewcursorinterface.h> #include <tdetexteditor/document.h> #include <tdetexteditor/encodinginterface.h> diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp index d7ba8c9b..5a82c88b 100644 --- a/vcs/subversion/subversion_core.cpp +++ b/vcs/subversion/subversion_core.cpp @@ -48,7 +48,7 @@ #include <tqregexp.h> #include <tdeapplication.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaboutdata.h> using namespace TDEIO; diff --git a/vcs/subversion/svn_tdeio.cpp b/vcs/subversion/svn_tdeio.cpp index f1205214..507ef8fa 100644 --- a/vcs/subversion/svn_tdeio.cpp +++ b/vcs/subversion/svn_tdeio.cpp @@ -32,7 +32,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdemessagebox.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include <tdestandarddirs.h> #include <tdelocale.h> |