diff options
author | Timothy Pearson <[email protected]> | 2013-01-27 01:05:39 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-27 01:05:39 -0600 |
commit | ff94d46e423398804d2ae63faeb114c2cf604fc4 (patch) | |
tree | 4481ffd491d15ac15081cea46d7cc298ef6351a4 /tdecachegrind | |
parent | b9553cef2a3cd9f5b89c8aca6f4b7781a079dbb7 (diff) | |
download | tdesdk-ff94d46e423398804d2ae63faeb114c2cf604fc4.tar.gz tdesdk-ff94d46e423398804d2ae63faeb114c2cf604fc4.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tdecachegrind')
-rw-r--r-- | tdecachegrind/tdecachegrind/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tdecachegrind/tdecachegrind/callgraphview.cpp | 4 | ||||
-rw-r--r-- | tdecachegrind/tdecachegrind/callmapview.cpp | 2 | ||||
-rw-r--r-- | tdecachegrind/tdecachegrind/configdlg.cpp | 2 | ||||
-rw-r--r-- | tdecachegrind/tdecachegrind/configuration.cpp | 22 | ||||
-rw-r--r-- | tdecachegrind/tdecachegrind/instrview.cpp | 2 | ||||
-rw-r--r-- | tdecachegrind/tdecachegrind/multiview.cpp | 2 | ||||
-rw-r--r-- | tdecachegrind/tdecachegrind/partselection.cpp | 2 | ||||
-rw-r--r-- | tdecachegrind/tdecachegrind/tabview.cpp | 2 | ||||
-rw-r--r-- | tdecachegrind/tdecachegrind/toplevel.cpp | 26 | ||||
-rw-r--r-- | tdecachegrind/tdecachegrind/traceitemview.cpp | 2 | ||||
-rw-r--r-- | tdecachegrind/tdecachegrind/treemap.cpp | 2 |
12 files changed, 35 insertions, 35 deletions
diff --git a/tdecachegrind/tdecachegrind/CMakeLists.txt b/tdecachegrind/tdecachegrind/CMakeLists.txt index 1e5ff51c..3906452e 100644 --- a/tdecachegrind/tdecachegrind/CMakeLists.txt +++ b/tdecachegrind/tdecachegrind/CMakeLists.txt @@ -45,6 +45,6 @@ tde_add_executable( tdecachegrind AUTOMOC multiview.cpp callitem.cpp coverageitem.cpp sourceitem.cpp costlistitem.cpp partlistitem.cpp functionitem.cpp instritem.cpp stackitem.cpp callgraphview.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/tdecachegrind/tdecachegrind/callgraphview.cpp b/tdecachegrind/tdecachegrind/callgraphview.cpp index 12da360b..77a612c5 100644 --- a/tdecachegrind/tdecachegrind/callgraphview.cpp +++ b/tdecachegrind/tdecachegrind/callgraphview.cpp @@ -37,11 +37,11 @@ #include <kdebug.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <ktempfile.h> #include <kapplication.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include "configuration.h" #include "callgraphview.h" diff --git a/tdecachegrind/tdecachegrind/callmapview.cpp b/tdecachegrind/tdecachegrind/callmapview.cpp index 0bc70c7c..7f5eff57 100644 --- a/tdecachegrind/tdecachegrind/callmapview.cpp +++ b/tdecachegrind/tdecachegrind/callmapview.cpp @@ -26,7 +26,7 @@ #include <klocale.h> #include <kiconloader.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "callmapview.h" #include "configuration.h" diff --git a/tdecachegrind/tdecachegrind/configdlg.cpp b/tdecachegrind/tdecachegrind/configdlg.cpp index 0ce58df6..0523d976 100644 --- a/tdecachegrind/tdecachegrind/configdlg.cpp +++ b/tdecachegrind/tdecachegrind/configdlg.cpp @@ -28,7 +28,7 @@ #include <tqmessagebox.h> #include <kcolorbutton.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <knumvalidator.h> diff --git a/tdecachegrind/tdecachegrind/configuration.cpp b/tdecachegrind/tdecachegrind/configuration.cpp index b18440d2..78736b66 100644 --- a/tdecachegrind/tdecachegrind/configuration.cpp +++ b/tdecachegrind/tdecachegrind/configuration.cpp @@ -20,7 +20,7 @@ * Configuration for KCachegrind */ -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kdebug.h> @@ -130,12 +130,12 @@ Configuration* Configuration::config() } -void Configuration::saveOptions(TDEConfig* kconfig) +void Configuration::saveOptions(TDEConfig* tdeconfig) { Configuration* c = config(); // color options - TDEConfigGroup colorConfig(kconfig, TQCString("CostColors")); + TDEConfigGroup colorConfig(tdeconfig, TQCString("CostColors")); TQDictIterator<ColorSetting> it( c->_colors ); int count = 1; for( ; it.current(); ++it ) { @@ -152,7 +152,7 @@ void Configuration::saveOptions(TDEConfig* kconfig) colorConfig.writeEntry( "Count", count-1); // source options - TDEConfigGroup sourceConfig(kconfig, TQCString("Source")); + TDEConfigGroup sourceConfig(tdeconfig, TQCString("Source")); sourceConfig.writeEntry("Dirs", c->_generalSourceDirs, ':'); TQDictIterator<TQStringList> it2( c->_objectSourceDirs ); count = 1; @@ -166,7 +166,7 @@ void Configuration::saveOptions(TDEConfig* kconfig) sourceConfig.writeEntry( "Count", count-1); // general options - TDEConfigGroup generalConfig(kconfig, TQCString("General")); + TDEConfigGroup generalConfig(tdeconfig, TQCString("General")); generalConfig.writeEntry("ShowPercentage", c->_showPercentage); generalConfig.writeEntry("ShowExpanded", c->_showExpanded); generalConfig.writeEntry("ShowCycles", c->_showCycles); @@ -179,7 +179,7 @@ void Configuration::saveOptions(TDEConfig* kconfig) generalConfig.writeEntry("Context", c->_context); generalConfig.writeEntry("NoCostInside", c->_noCostInside); - TDEConfigGroup ctConfig(kconfig, TQCString("CostTypes")); + TDEConfigGroup ctConfig(tdeconfig, TQCString("CostTypes")); int ctCount = TraceCostType::knownTypeCount(); ctConfig.writeEntry( "Count", ctCount); for (int i=0; i<ctCount; i++) { @@ -200,7 +200,7 @@ void Configuration::saveOptions(TDEConfig* kconfig) -void Configuration::readOptions(TDEConfig* kconfig) +void Configuration::readOptions(TDEConfig* tdeconfig) { int i, count; Configuration* c = config(); @@ -226,7 +226,7 @@ void Configuration::readOptions(TDEConfig* kconfig) c->color("CostType-Dr")->color = TQColor(40,40,180); c->color("CostType-Dw")->color = TQColor(80,80,120); - TDEConfigGroup colorConfig(kconfig, TQCString("CostColors")); + TDEConfigGroup colorConfig(tdeconfig, TQCString("CostColors")); count = colorConfig.readNumEntry("Count", 0); for (i=1;i<=count;i++) { TQString n = colorConfig.readEntry(TQString("Name%1").arg(i)); @@ -245,7 +245,7 @@ void Configuration::readOptions(TDEConfig* kconfig) } // source options - TDEConfigGroup sourceConfig(kconfig, TQCString("Source")); + TDEConfigGroup sourceConfig(tdeconfig, TQCString("Source")); TQStringList dirs; dirs = sourceConfig.readListEntry("Dirs", ':'); if (dirs.count()>0) c->_generalSourceDirs = dirs; @@ -263,7 +263,7 @@ void Configuration::readOptions(TDEConfig* kconfig) // general options - TDEConfigGroup generalConfig(kconfig, TQCString("General")); + TDEConfigGroup generalConfig(tdeconfig, TQCString("General")); c->_showPercentage = generalConfig.readBoolEntry("ShowPercentage", true); c->_showExpanded = generalConfig.readBoolEntry("ShowExpanded", false); c->_showCycles = generalConfig.readBoolEntry("ShowCycles", true); @@ -279,7 +279,7 @@ void Configuration::readOptions(TDEConfig* kconfig) // known cost types if (TraceCostType::knownTypeCount()==0) { - TDEConfigGroup ctConfig(kconfig, TQCString("CostTypes")); + TDEConfigGroup ctConfig(tdeconfig, TQCString("CostTypes")); int ctCount = ctConfig.readNumEntry("Count", 0); if (ctCount>0) { for (int i=1;i<=ctCount;i++) { diff --git a/tdecachegrind/tdecachegrind/instrview.cpp b/tdecachegrind/tdecachegrind/instrview.cpp index 5b819d6c..9413508f 100644 --- a/tdecachegrind/tdecachegrind/instrview.cpp +++ b/tdecachegrind/tdecachegrind/instrview.cpp @@ -25,7 +25,7 @@ #include <tqwhatsthis.h> #include <tqpopupmenu.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include "configuration.h" diff --git a/tdecachegrind/tdecachegrind/multiview.cpp b/tdecachegrind/tdecachegrind/multiview.cpp index 9bf384b0..628eefab 100644 --- a/tdecachegrind/tdecachegrind/multiview.cpp +++ b/tdecachegrind/tdecachegrind/multiview.cpp @@ -24,7 +24,7 @@ */ #include <tqobjectlist.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include "multiview.h" diff --git a/tdecachegrind/tdecachegrind/partselection.cpp b/tdecachegrind/tdecachegrind/partselection.cpp index 4f30e1fe..1b6ff153 100644 --- a/tdecachegrind/tdecachegrind/partselection.cpp +++ b/tdecachegrind/tdecachegrind/partselection.cpp @@ -30,7 +30,7 @@ #include <tqlayout.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include "partselection.h" diff --git a/tdecachegrind/tdecachegrind/tabview.cpp b/tdecachegrind/tdecachegrind/tabview.cpp index 2c38aa4b..5a360110 100644 --- a/tdecachegrind/tdecachegrind/tabview.cpp +++ b/tdecachegrind/tdecachegrind/tabview.cpp @@ -29,7 +29,7 @@ #include <tqpopupmenu.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "tabview.h" #include "costtypeview.h" diff --git a/tdecachegrind/tdecachegrind/toplevel.cpp b/tdecachegrind/tdecachegrind/toplevel.cpp index bb9db209..9efd6400 100644 --- a/tdecachegrind/tdecachegrind/toplevel.cpp +++ b/tdecachegrind/tdecachegrind/toplevel.cpp @@ -42,8 +42,8 @@ #include <kstdaction.h> #include <kaction.h> #include <kurl.h> -#include <kfiledialog.h> -#include <kio/netaccess.h> +#include <tdefiledialog.h> +#include <tdeio/netaccess.h> #include <kedittoolbar.h> #include <kkeydialog.h> #include <ktip.h> @@ -105,9 +105,9 @@ TopLevel::TopLevel(const char *name) #endif _statusbar->addWidget(_statusLabel, 1); - TDEConfig* kconfig = TDEGlobal::config(); - Configuration::readOptions( kconfig ); - _openRecent->loadEntries( kconfig ); + TDEConfig* tdeconfig = TDEGlobal::config(); + Configuration::readOptions( tdeconfig ); + _openRecent->loadEntries( tdeconfig ); // set toggle after reading configuration _showPercentage = Configuration::showPercentage(); @@ -201,20 +201,20 @@ void TopLevel::setupPartSelection(PartSelection* ps) */ void TopLevel::saveCurrentState(TQString postfix) { - TDEConfig* kconfig = TDEGlobal::config(); + TDEConfig* tdeconfig = TDEGlobal::config(); TQCString pf = postfix.ascii(); - TDEConfigGroup psConfig(kconfig, TQCString("PartOverview")+pf); + TDEConfigGroup psConfig(tdeconfig, TQCString("PartOverview")+pf); _partSelection->saveVisualisationConfig(&psConfig); - TDEConfigGroup stateConfig(kconfig, TQCString("CurrentState")+pf); + TDEConfigGroup stateConfig(tdeconfig, TQCString("CurrentState")+pf); stateConfig.writeEntry("CostType", _costType ? _costType->name() : TQString("?")); stateConfig.writeEntry("CostType2", _costType2 ? _costType2->name() : TQString("?")); stateConfig.writeEntry("GroupType", TraceItem::typeName(_groupType)); - _multiView->saveViewConfig(kconfig, TQString("MainView"), postfix, true); + _multiView->saveViewConfig(tdeconfig, TQString("MainView"), postfix, true); } /** @@ -253,17 +253,17 @@ void TopLevel::saveTraceSettings() */ void TopLevel::restoreCurrentState(TQString postfix) { - TDEConfig* kconfig = TDEGlobal::config(); - TQStringList gList = kconfig->groupList(); + TDEConfig* tdeconfig = TDEGlobal::config(); + TQStringList gList = tdeconfig->groupList(); TQCString pf = postfix.ascii(); // dock properties (not position, this should be have done before) TQCString group = TQCString("PartOverview"); if (gList.contains(group+pf)) group += pf; - TDEConfigGroup psConfig(kconfig, group); + TDEConfigGroup psConfig(tdeconfig, group); _partSelection->readVisualisationConfig(&psConfig); - _multiView->readViewConfig(kconfig, TQString("MainView"), postfix, true); + _multiView->readViewConfig(tdeconfig, TQString("MainView"), postfix, true); _taSplit->setChecked(_multiView->childCount()>1); _taSplitDir->setEnabled(_multiView->childCount()>1); _taSplitDir->setChecked(_multiView->orientation() == Qt::Horizontal); diff --git a/tdecachegrind/tdecachegrind/traceitemview.cpp b/tdecachegrind/tdecachegrind/traceitemview.cpp index 8df7297f..82f4e11f 100644 --- a/tdecachegrind/tdecachegrind/traceitemview.cpp +++ b/tdecachegrind/tdecachegrind/traceitemview.cpp @@ -21,7 +21,7 @@ */ #include <tqwidget.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kdebug.h> diff --git a/tdecachegrind/tdecachegrind/treemap.cpp b/tdecachegrind/tdecachegrind/treemap.cpp index fe5965b2..46e661f6 100644 --- a/tdecachegrind/tdecachegrind/treemap.cpp +++ b/tdecachegrind/tdecachegrind/treemap.cpp @@ -30,7 +30,7 @@ #include <tqpopupmenu.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include "treemap.h" |