[kde-doc-english] [kcachegrind/frameworks] /: Merge branch 'master' into frameworks

[Josef Weidendorfer]

Git commit efc018ad1006f030199c6622d53a0cd0e5aee43b by Josef Weidendorfer.
Committed on 15/06/2015 at 21:06.
Pushed by weidendo into branch 'frameworks'.

Merge branch 'master' into frameworks

M  +2    -2    doc/index.docbook
M  +2    -2    kcachegrind/main.cpp
R  +1    -1    kcachegrind/org.kde.kcachegrind.desktop
M  +3    -7    libviews/instrview.cpp
M  +2    -2    qcachegrind/qcgtoplevel.cpp

http://commits.kde.org/kcachegrind/efc018ad1006f030199c6622d53a0cd0e5aee43b

diff --cc kcachegrind/main.cpp
index 63077b7,583d1dc..a3d9a9d
--- a/kcachegrind/main.cpp
+++ b/kcachegrind/main.cpp
@@@ -37,22 -36,30 +37,22 @@@
  
  int main( int argc, char ** argv )
  {
 -  KAboutData aboutData("kcachegrind", 0,
 -                       ki18n("KCachegrind"),
 +  QApplication a(argc, argv);
 +  KAboutData aboutData("kcachegrind",
 +                       i18n("KCachegrind"),
                         KCACHEGRIND_VERSION,
 -                       ki18n("KDE Frontend for Callgrind/Cachegrind"),
 -                       KAboutData::License_GPL,
 -                       ki18n("(C) 2002 - 2015"), KLocalizedString(),
 +                       i18n("KDE Frontend for Callgrind/Cachegrind"),
 +                       KAboutLicense::GPL,
-                        i18n("(C) 2002 - 2011"), QString(),
-                        "http://kcachegrind.sf.net");
++                       i18n("(C) 2002 - 2015"), QString(),
+                        "https://kcachegrind.github.io");
 -  aboutData.addAuthor(ki18n("Josef Weidendorfer"),
 -                      ki18n("Author/Maintainer"),
 +  aboutData.addAuthor(i18n("Josef Weidendorfer"),
 +                      i18n("Author/Maintainer"),
                        "Josef.Weidendorfer at gmx.de");
  
 -  KCmdLineArgs::init(argc, argv, &aboutData);
 -
 -  KCmdLineOptions options;
 -  //options.add("r <exec>", ki18n("Run <exec> under cachegrind"));
 -  options.add("+[trace]", ki18n("Show information of this trace"));
 -  KCmdLineArgs::addCmdLineOptions( options );
 -
 -  KApplication a;
 -  KGlobal::locale()->insertCatalog("kcachegrind_qt");
 -  TopLevel* t;
 +//   KGlobal::locale()->insertCatalog("kcachegrind_qt");
    Loader::initLoaders();
  
 -  KConfig* kc = KGlobal::config().data();
 +  KConfig* kc = KSharedConfig::openConfig().data();
    ConfigStorage::setStorage(new KDEConfigStorage(kc));
  
    if (a.isSessionRestored()){
diff --cc kcachegrind/org.kde.kcachegrind.desktop
index 5c31d67,7eaa319..d46cdb3
--- a/kcachegrind/org.kde.kcachegrind.desktop
+++ b/kcachegrind/org.kde.kcachegrind.desktop
@@@ -174,6 -174,5 +174,6 @@@ Comment[x-test]=xxVisualization of Perf
  Comment[zh_CN]=性能测试数据的可视化表现
  Comment[zh_TW]=效能分析資料視覺化
  X-DBUS-StartupType=Multi
- X-DBUS-ServiceName=net.sf.kcachegrind
+ X-DBUS-ServiceName=io.github.kcachegrind
  Categories=Qt;KDE;Development;
 +X-DBUS-ServiceName=org.kde.kcachegrind