diff --git a/src/plugins/bazaar/constants.h b/src/plugins/bazaar/constants.h index 0699855dc0ee5b509810a64a177d2a3a677b4cd9..c81427eba0a270fd1a49ed17077d66fce1faf149 100644 --- a/src/plugins/bazaar/constants.h +++ b/src/plugins/bazaar/constants.h @@ -49,12 +49,12 @@ const char ANNOTATE_CHANGESET_ID[] = "([.0-9]+)"; const char FILELOG_ID[] = "Bazaar File Log Editor"; const char FILELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Bazaar File Log Editor"); const char FILELOG[] = "Bazaar File Log Editor"; -const char LOGAPP[] = "application/vnd.nokia.text.scs_bazaar_log"; +const char LOGAPP[] = "text/vnd.qtcreator.bazaar.log"; const char ANNOTATELOG_ID[] = "Bazaar Annotation Editor"; const char ANNOTATELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Bazaar Annotation Editor"); const char ANNOTATELOG[] = "Bazaar Annotation Editor"; -const char ANNOTATEAPP[] = "application/vnd.nokia.text.scs_bazaar_annotatelog"; +const char ANNOTATEAPP[] = "text/vnd.qtcreator.bazaar.annotation"; const char DIFFLOG_ID[] = "Bazaar Diff Editor"; const char DIFFLOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Bazaar Diff Editor"); @@ -64,7 +64,7 @@ const char DIFFAPP[] = "text/x-patch"; // Submit editor parameters const char COMMIT_ID[] = "Bazaar Commit Log Editor"; const char COMMIT_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Bazaar Commit Log Editor"); -const char COMMITMIMETYPE[] = "application/vnd.nokia.text.scs_bazaar_commitlog"; +const char COMMITMIMETYPE[] = "text/vnd.qtcreator.bazaar.commit"; // Menu items // File menu actions diff --git a/src/plugins/clearcase/clearcaseconstants.h b/src/plugins/clearcase/clearcaseconstants.h index ae13d5596122e5fb1ac98ca4f93934c3d0f82544..708219c29421d5e7ee23bdbeb21c57bdcb4564ac 100644 --- a/src/plugins/clearcase/clearcaseconstants.h +++ b/src/plugins/clearcase/clearcaseconstants.h @@ -37,7 +37,7 @@ namespace ClearCase { namespace Constants { const char VCS_ID_CLEARCASE[] = "E.ClearCase"; -const char CLEARCASE_SUBMIT_MIMETYPE[] = "application/vnd.audc.text.clearcase.submit"; +const char CLEARCASE_SUBMIT_MIMETYPE[] = "text/vnd.qtcreator.clearcase.submit"; const char CLEARCASECHECKINEDITOR[] = "ClearCase Check In Editor"; const char CLEARCASECHECKINEDITOR_ID[] = "ClearCase Check In Editor"; const char CLEARCASECHECKINEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "ClearCase Check In Editor"); diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index 526047d1abdf6154ef3164d7f2a3694e5584d8aa..a31f6e26dcb4ebafcfd4c23b57fa91c8e405dad4 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -125,12 +125,12 @@ static const VcsBase::VcsBaseEditorParameters editorParameters[] = { "ClearCase File Log Editor", // id QT_TRANSLATE_NOOP("VCS", "ClearCase File Log Editor"), // display_name "ClearCase File Log Editor", // context - "application/vnd.audc.text.scs_cc_filelog"}, + "text/vnd.qtcreator.clearcase.log"}, { VcsBase::AnnotateOutput, "ClearCase Annotation Editor", // id QT_TRANSLATE_NOOP("VCS", "ClearCase Annotation Editor"), // display_name "ClearCase Annotation Editor", // context - "application/vnd.audc.text.scs_cc_annotation"}, + "text/vnd.qtcreator.clearcase.annotation"}, { VcsBase::DiffOutput, "ClearCase Diff Editor", // id QT_TRANSLATE_NOOP("VCS", "ClearCase Diff Editor"), // display_name diff --git a/src/plugins/coreplugin/mimedatabase.cpp b/src/plugins/coreplugin/mimedatabase.cpp index 662988180f0b0701fa36430abe4d88d6b20688ed..f8c66a5b249ce31aba36f702ded41386b338f1ac 100644 --- a/src/plugins/coreplugin/mimedatabase.cpp +++ b/src/plugins/coreplugin/mimedatabase.cpp @@ -535,7 +535,7 @@ bool MimeGlobPattern::matches(const QString &fileName) const <?xml version="1.0" encoding="UTF-8"?> <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> <!-- Mime types must match the desktop file associations --> - <mime-type type="application/vnd.nokia.qt.qmakeprofile"> + <mime-type type="application/vnd.qt.qmakeprofile"> <comment xml:lang="en">Qt qmake Profile</comment> <glob pattern="*.pro" weight="50"/> </mime-type> diff --git a/src/plugins/cvs/cvsconstants.h b/src/plugins/cvs/cvsconstants.h index 80b1ef81b5307c67ed122cb535a96fa46c79ac68..d3bc8e4b73d5e3271f3f6d529d30a1e049f24662 100644 --- a/src/plugins/cvs/cvsconstants.h +++ b/src/plugins/cvs/cvsconstants.h @@ -33,7 +33,7 @@ namespace Cvs { namespace Constants { -const char CVS_SUBMIT_MIMETYPE[] = "application/vnd.nokia.text.cvs.submit"; +const char CVS_SUBMIT_MIMETYPE[] = "text/vnd.qtcreator.cvs.submit"; const char CVSCOMMITEDITOR[] = "CVS Commit Editor"; const char CVSCOMMITEDITOR_ID[] = "CVS Commit Editor"; const char CVSCOMMITEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "CVS Commit Editor"); diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index ec809a1dedd69fdd5e2fef1e5a5789f604fdf8d3..e36f26473ef7a6a3ba6812fbf51bdb731406efc0 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/src/plugins/cvs/cvsplugin.cpp @@ -120,17 +120,17 @@ static const VcsBaseEditorParameters editorParameters[] = { "CVS Command Log Editor", // id QT_TRANSLATE_NOOP("VCS", "CVS Command Log Editor"), // display name "CVS Command Log Editor", // context - "application/vnd.nokia.text.scs_cvs_commandlog"}, + "text/vnd.qtcreator.cvs.commandlog"}, { LogOutput, "CVS File Log Editor", // id QT_TRANSLATE_NOOP("VCS", "CVS File Log Editor"), // display name "CVS File Log Editor", // context - "application/vnd.nokia.text.scs_cvs_filelog"}, + "text/vnd.qtcreator.cvs.log"}, { AnnotateOutput, "CVS Annotation Editor", // id QT_TRANSLATE_NOOP("VCS", "CVS Annotation Editor"), // display name "CVS Annotation Editor", // context - "application/vnd.nokia.text.scs_cvs_annotation"}, + "text/vnd.qtcreator.cvs.annotation"}, { DiffOutput, "CVS Diff Editor", // id QT_TRANSLATE_NOOP("VCS", "CVS Diff Editor"), // display name diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 2aa554a92ba07e20bd509d65afdda4303cb366da..75665100fff13b862586b3c507562bd4316ff695 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -2548,7 +2548,7 @@ QString GdbEngine::breakLocation(const QString &file) const BreakpointPathUsage GdbEngine::defaultEngineBreakpointPathUsage() const { - // e.g. MinGW gdb 70200 (part of Nokia Qt SDK) + // e.g. MinGW gdb 70200 (part of Qt SDK) // fails to set breakpoints with absolute paths if // the source path isn't canonical if (m_gdbVersion < 70300) diff --git a/src/plugins/genericprojectmanager/genericprojectconstants.h b/src/plugins/genericprojectmanager/genericprojectconstants.h index 54ea0bcfa88f0f520eb3a3b567d6bfe35ddd5171..4587586d2974611b01df3b785243a4df2ee086d2 100644 --- a/src/plugins/genericprojectmanager/genericprojectconstants.h +++ b/src/plugins/genericprojectmanager/genericprojectconstants.h @@ -40,9 +40,9 @@ const char GENERICMIMETYPE[] = "text/x-generic-project"; // ### FIXME const char C_FILESEDITOR[] = ".files Editor"; const char FILES_EDITOR_ID[] = "QT4.FilesEditor"; -const char FILES_MIMETYPE[] = "application/vnd.nokia.qt.generic.files"; -const char INCLUDES_MIMETYPE[] = "application/vnd.nokia.qt.generic.includes"; -const char CONFIG_MIMETYPE[] = "application/vnd.nokia.qt.generic.config"; +const char FILES_MIMETYPE[] = "application/vnd.qtcreator.generic.files"; +const char INCLUDES_MIMETYPE[] = "application/vnd.qtcreator.generic.includes"; +const char CONFIG_MIMETYPE[] = "application/vnd.qtcreator.generic.config"; // Project const char GENERICPROJECT_ID[] = "GenericProjectManager.GenericProject"; diff --git a/src/plugins/git/gitconstants.h b/src/plugins/git/gitconstants.h index 69cef170cc1b65529cbe070ae89629ab9f2f703b..872bf3022ce7c9ae44c45d0240b41c869663b805 100644 --- a/src/plugins/git/gitconstants.h +++ b/src/plugins/git/gitconstants.h @@ -53,7 +53,7 @@ const char GITSUBMITEDITOR_ID[] = "Git Submit Editor"; const char GITSUBMITEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Git Submit Editor"); const char SUBMIT_CURRENT[] = "Git.SubmitCurrentLog"; const char DIFF_SELECTED[] = "Git.DiffSelectedFilesInLog"; -const char SUBMIT_MIMETYPE[] = "application/vnd.nokia.text.git.submit"; +const char SUBMIT_MIMETYPE[] = "text/vnd.qtcreator.git.submit"; } // namespace Constants } // namespace Git diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 5b3fe507c08124a2963bf7ea3e21cb11f3209cbc..c0bfc9de76247312543aa991502527d42cd2141a 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -88,17 +88,17 @@ static const VcsBase::VcsBaseEditorParameters editorParameters[] = { Git::Constants::GIT_COMMAND_LOG_EDITOR_ID, Git::Constants::GIT_COMMAND_LOG_EDITOR_DISPLAY_NAME, Git::Constants::C_GIT_COMMAND_LOG_EDITOR, - "application/vnd.nokia.text.scs_git_commandlog"}, + "text/vnd.qtcreator.git.commandlog"}, { VcsBase::LogOutput, Git::Constants::GIT_LOG_EDITOR_ID, Git::Constants::GIT_LOG_EDITOR_DISPLAY_NAME, Git::Constants::C_GIT_LOG_EDITOR, - "application/vnd.nokia.text.scs_git_filelog"}, + "text/vnd.qtcreator.git.log"}, { VcsBase::AnnotateOutput, Git::Constants::GIT_BLAME_EDITOR_ID, Git::Constants::GIT_BLAME_EDITOR_DISPLAY_NAME, Git::Constants::C_GIT_BLAME_EDITOR, - "application/vnd.nokia.text.scs_git_annotation"}, + "text/vnd.qtcreator.git.annotation"}, { VcsBase::DiffOutput, Git::Constants::GIT_DIFF_EDITOR_ID, Git::Constants::GIT_DIFF_EDITOR_DISPLAY_NAME, diff --git a/src/plugins/mercurial/constants.h b/src/plugins/mercurial/constants.h index dd476817478e3fcf8b3821d538103051c347b991..a03f95593a68d39f3aeb4a0619ca2faa860061e0 100644 --- a/src/plugins/mercurial/constants.h +++ b/src/plugins/mercurial/constants.h @@ -49,12 +49,12 @@ const char DIFFIDENTIFIER[] = "^(?:diff --git a/|[+-]{3} (?:/dev/null|[ab]/(.+$) const char FILELOG_ID[] = "Mercurial File Log Editor"; const char FILELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Mercurial File Log Editor"); const char FILELOG[] = "Mercurial File Log Editor"; -const char LOGAPP[] = "application/vnd.nokia.text.scs_mercurial_log"; +const char LOGAPP[] = "text/vnd.qtcreator.mercurial.log"; const char ANNOTATELOG_ID[] = "Mercurial Annotation Editor"; const char ANNOTATELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Mercurial Annotation Editor"); const char ANNOTATELOG[] = "Mercurial Annotation Editor"; -const char ANNOTATEAPP[] = "application/vnd.nokia.text.scs_mercurial_annotatelog"; +const char ANNOTATEAPP[] = "text/vnd.qtcreator.mercurial.annotation"; const char DIFFLOG_ID[] = "Mercurial Diff Editor"; const char DIFFLOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Mercurial Diff Editor"); @@ -64,7 +64,7 @@ const char DIFFAPP[] = "text/x-patch"; // Submit editor parameters const char COMMIT_ID[] = "Mercurial Commit Log Editor"; const char COMMIT_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Mercurial Commit Log Editor"); -const char COMMITMIMETYPE[] = "application/vnd.nokia.text.scs_mercurial_commitlog"; +const char COMMITMIMETYPE[] = "text/vnd.qtcreator.mercurial.commit"; // File menu actions const char ADD[] = "Mercurial.AddSingleFile"; diff --git a/src/plugins/perforce/perforceconstants.h b/src/plugins/perforce/perforceconstants.h index a34410e8fb77970067bd88cc938de9aaecef0e7a..316fc2483c31565149f6e35e30471186e9ca2f76 100644 --- a/src/plugins/perforce/perforceconstants.h +++ b/src/plugins/perforce/perforceconstants.h @@ -53,7 +53,7 @@ const char PERFORCE_ANNOTATION_EDITOR_CONTEXT[] = "Perforce Annotation Editor"; const char SUBMIT_CURRENT[] = "Perforce.SubmitCurrentLog"; const char DIFF_SELECTED[] = "Perforce.DiffSelectedFilesInLog"; -const char SUBMIT_MIMETYPE[] = "application/vnd.nokia.text.p4.submit"; +const char SUBMIT_MIMETYPE[] = "text/vnd.qtcreator.p4.submit"; enum { debug = 0 }; diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index f83b30143f409a7fe18c90c26b01c2ccd84a5b9a..d90c3ab0c5fbb5c43c092aa4330bd6c98802929c 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -78,12 +78,12 @@ static const VcsBase::VcsBaseEditorParameters editorParameters[] = { Perforce::Constants::PERFORCE_LOG_EDITOR_ID, Perforce::Constants::PERFORCE_LOG_EDITOR_DISPLAY_NAME, Perforce::Constants::PERFORCE_LOG_EDITOR_CONTEXT, - "application/vnd.nokia.text.scs_filelog"}, + "text/vnd.qtcreator.p4.log"}, { VcsBase::AnnotateOutput, Perforce::Constants::PERFORCE_ANNOTATION_EDITOR_ID, Perforce::Constants::PERFORCE_ANNOTATION_EDITOR_DISPLAY_NAME, Perforce::Constants::PERFORCE_ANNOTATION_EDITOR_CONTEXT, - "application/vnd.nokia.text.scs_annotation"}, + "text/vnd.qtcreator.p4.annotation"}, { VcsBase::DiffOutput, Perforce::Constants::PERFORCE_DIFF_EDITOR_ID, Perforce::Constants::PERFORCE_DIFF_EDITOR_DISPLAY_NAME, diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h index b20fddfd8befad18d1a50663b5302a48a6d260f7..e68ae893f43cdd327fc3e194b5377af0223a8aea 100644 --- a/src/plugins/projectexplorer/projectexplorerconstants.h +++ b/src/plugins/projectexplorer/projectexplorerconstants.h @@ -171,7 +171,7 @@ const char CPP_SOURCE_MIMETYPE[] = "text/x-c++src"; const char CPP_HEADER_MIMETYPE[] = "text/x-c++hdr"; const char FORM_MIMETYPE[] = "application/x-designer"; const char QML_MIMETYPE[] = "application/x-qml"; // separate def also in qmljstoolsconstants.h -const char RESOURCE_MIMETYPE[] = "application/vnd.nokia.xml.qt.resource"; +const char RESOURCE_MIMETYPE[] = "application/vnd.qt.xml.resource"; // Settings page const char PROJECTEXPLORER_SETTINGS_CATEGORY[] = "K.ProjectExplorer"; diff --git a/src/plugins/qt4projectmanager/Qt4ProjectManager.mimetypes.xml b/src/plugins/qt4projectmanager/Qt4ProjectManager.mimetypes.xml index 39b1d71cbbe5b61a11d1f21133865e890f8d090b..b9d06e6aeab50bcfd453bdb805ffb30c49ebac55 100644 --- a/src/plugins/qt4projectmanager/Qt4ProjectManager.mimetypes.xml +++ b/src/plugins/qt4projectmanager/Qt4ProjectManager.mimetypes.xml @@ -1,16 +1,16 @@ <?xml version="1.0"?> <mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'> - <mime-type type="application/vnd.nokia.qt.qmakeprofile"> + <mime-type type="application/vnd.qt.qmakeprofile"> <sub-class-of type="text/plain"/> <comment>Qt Project file</comment> <glob pattern="*.pro"/> </mime-type> - <mime-type type="application/vnd.nokia.qt.qmakeproincludefile"> + <mime-type type="application/vnd.qt.qmakeproincludefile"> <sub-class-of type="text/plain"/> <comment>Qt Project include file</comment> <glob pattern="*.pri"/> </mime-type> - <mime-type type="application/vnd.nokia.qt.qmakeprofeaturefile"> + <mime-type type="application/vnd.qt.qmakeprofeaturefile"> <sub-class-of type="text/plain"/> <comment>Qt Project feature file</comment> <glob pattern="*.prf"/> diff --git a/src/plugins/qt4projectmanager/qmakeparser.cpp b/src/plugins/qt4projectmanager/qmakeparser.cpp index ba15f6ab23916c7566213ae96bd370d7c1a405b7..4e31de957cf04bffa189f0d48b7067d464e7fe12 100644 --- a/src/plugins/qt4projectmanager/qmakeparser.cpp +++ b/src/plugins/qt4projectmanager/qmakeparser.cpp @@ -152,13 +152,13 @@ void Qt4ProjectManagerPlugin::testQmakeOutputParsers_data() << QString(); QTest::newRow("qMake warning with location") - << QString::fromLatin1("WARNING: e:\\NokiaQtSDK\\Simulator\\Qt\\msvc2008\\lib\\qtmaind.prl:1: Unescaped backslashes are deprecated.") + << QString::fromLatin1("WARNING: e:\\QtSDK\\Simulator\\Qt\\msvc2008\\lib\\qtmaind.prl:1: Unescaped backslashes are deprecated.") << OutputParserTester::STDERR << QString() << QString() << (QList<ProjectExplorer::Task>() << Task(Task::Warning, QLatin1String("Unescaped backslashes are deprecated."), - Utils::FileName::fromUserInput(QLatin1String("e:\\NokiaQtSDK\\Simulator\\Qt\\msvc2008\\lib\\qtmaind.prl")), 1, + Utils::FileName::fromUserInput(QLatin1String("e:\\QtSDK\\Simulator\\Qt\\msvc2008\\lib\\qtmaind.prl")), 1, categoryBuildSystem)) << QString(); } diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h index a157370557b6426387ecd0542056f08c0a2ef57e..85c8d377d64541e994a0618218cb896f652f43cd 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h +++ b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h @@ -45,9 +45,9 @@ const char M_CONTEXT[] = "ProFileEditor.ContextMenu"; const char PROJECT_ID[] = "Qt4.Qt4Project"; const char PROFILE_EDITOR_ID[] = "Qt4.proFileEditor"; const char PROFILE_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("OpenWith::Editors", ".pro File Editor"); -const char PROFILE_MIMETYPE [] = "application/vnd.nokia.qt.qmakeprofile"; -const char PROINCLUDEFILE_MIMETYPE [] = "application/vnd.nokia.qt.qmakeproincludefile"; -const char PROFEATUREFILE_MIMETYPE [] = "application/vnd.nokia.qt.qmakeprofeaturefile"; +const char PROFILE_MIMETYPE [] = "application/vnd.qt.qmakeprofile"; +const char PROINCLUDEFILE_MIMETYPE [] = "application/vnd.qt.qmakeproincludefile"; +const char PROFEATUREFILE_MIMETYPE [] = "application/vnd.qt.qmakeprofeaturefile"; const char CPP_SOURCE_MIMETYPE[] = "text/x-c++src"; const char CPP_HEADER_MIMETYPE[] = "text/x-c++hdr"; const char FORM_MIMETYPE[] = "application/x-designer"; diff --git a/src/plugins/resourceeditor/resourceeditorconstants.h b/src/plugins/resourceeditor/resourceeditorconstants.h index ae5c718493d3c09eba2e513246290e14b14ed8f5..f5eec5526c299b7f0b5bc79c840c27738d15a720 100644 --- a/src/plugins/resourceeditor/resourceeditorconstants.h +++ b/src/plugins/resourceeditor/resourceeditorconstants.h @@ -39,7 +39,7 @@ const char C_RESOURCEEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("OpenWith::Editor const char REFRESH[] = "ResourceEditor.Refresh"; -const char C_RESOURCE_MIMETYPE[] = "application/vnd.nokia.xml.qt.resource"; +const char C_RESOURCE_MIMETYPE[] = "application/vnd.qt.xml.resource"; } // namespace Constants } // namespace ResourceEditor diff --git a/src/plugins/resourceeditor/resourceeditorfactory.cpp b/src/plugins/resourceeditor/resourceeditorfactory.cpp index 748b4e9973481a213be0bf8d61ed39d9e8f8e6a1..7adc6de66ceb6724679936a3a51f4184463cef23 100644 --- a/src/plugins/resourceeditor/resourceeditorfactory.cpp +++ b/src/plugins/resourceeditor/resourceeditorfactory.cpp @@ -44,7 +44,7 @@ using namespace ResourceEditor::Constants; ResourceEditorFactory::ResourceEditorFactory(ResourceEditorPlugin *plugin) : Core::IEditorFactory(plugin), - m_mimeTypes(QStringList(QLatin1String("application/vnd.nokia.xml.qt.resource"))), + m_mimeTypes(QStringList(QLatin1String(C_RESOURCE_MIMETYPE))), m_plugin(plugin) { Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance(); diff --git a/src/plugins/subversion/subversionconstants.h b/src/plugins/subversion/subversionconstants.h index 39c670c715221537cf199366b8c5a0dffeb440dc..ff5adfeb94aad439cd910f023cc9825725cf4b85 100644 --- a/src/plugins/subversion/subversionconstants.h +++ b/src/plugins/subversion/subversionconstants.h @@ -35,7 +35,7 @@ namespace Subversion { namespace Constants { -const char SUBVERSION_SUBMIT_MIMETYPE[] = "application/vnd.nokia.text.subversion.submit"; +const char SUBVERSION_SUBMIT_MIMETYPE[] = "text/vnd.qtcreator.svn.submit"; const char SUBVERSIONCOMMITEDITOR[] = "Subversion Commit Editor"; const char SUBVERSIONCOMMITEDITOR_ID[] = "Subversion Commit Editor"; const char SUBVERSIONCOMMITEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Subversion Commit Editor"); diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index b49a9d31548d237716c7e35bfb6e10777dd464bc..5a9a82b1454bef977d4d3c37e2b969393f5e8552 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -116,12 +116,12 @@ static const VcsBase::VcsBaseEditorParameters editorParameters[] = { "Subversion File Log Editor", // id QT_TRANSLATE_NOOP("VCS", "Subversion File Log Editor"), // display_name "Subversion File Log Editor", // context - "application/vnd.nokia.text.scs_svn_filelog"}, + "text/vnd.qtcreator.svn.log"}, { VcsBase::AnnotateOutput, "Subversion Annotation Editor", // id QT_TRANSLATE_NOOP("VCS", "Subversion Annotation Editor"), // display_name "Subversion Annotation Editor", // context - "application/vnd.nokia.text.scs_svn_annotation"}, + "text/vnd.qtcreator.svn.annotation"}, { VcsBase::DiffOutput, "Subversion Diff Editor", // id QT_TRANSLATE_NOOP("VCS", "Subversion Diff Editor"), // display_name diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index a649c9687016cc273185b7ce739a2aa5bbe47203..1d2aa1a2a7d95055eb3dcff1ef881b10930d7671 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -201,8 +201,8 @@ QString BaseTextEditorWidget::convertToPlainText(const QString &txt) return ret; } -static const char kTextBlockMimeType[] = "application/vnd.nokia.qtcreator.blocktext"; -static const char kVerticalTextBlockMimeType[] = "application/vnd.nokia.qtcreator.vblocktext"; +static const char kTextBlockMimeType[] = "application/vnd.qtcreator.blocktext"; +static const char kVerticalTextBlockMimeType[] = "application/vnd.qtcreator.vblocktext"; BaseTextEditorWidget::BaseTextEditorWidget(QWidget *parent) diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index 668918420381c2cda16250906a24ea7a322c815b..0d2ac55e918a83bb5fd1464c2df45cf6e5879753 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -4297,8 +4297,6 @@ void tst_Dumpers::dumper_data() // % Check("m.1.second.2 "3" std::string"); -// // http://codepaster.europe.nokia.com/?id=42895 - // QTest::newRow("42895() // "void g(int c, int d)\n" // "{\n" diff --git a/tests/manual/debugger/simple/simple_test_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp index 691eda5d69a99c192510799746d048d62c3f1cb1..5e6ed6039dd6d417ac47e6e054bc75ac164878da 100644 --- a/tests/manual/debugger/simple/simple_test_app.cpp +++ b/tests/manual/debugger/simple/simple_test_app.cpp @@ -6339,8 +6339,6 @@ namespace qc41700 { namespace cp42895 { - // http://codepaster.europe.nokia.com/?id=42895 - void g(int c, int d) { qDebug() << c << d;