From b1e66b339befa7bdf222f7bb80a431236a3ff689 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 1 Jun 2019 15:56:13 +0900 Subject: Adjusted to use new TQStringVariantMap type. Signed-off-by: Michele Calgaro --- parts/astyle/astyle_adaptor.cpp | 4 ++-- parts/astyle/astyle_adaptor.h | 2 +- parts/astyle/astyle_part.cpp | 16 ++++++++-------- parts/astyle/astyle_part.h | 10 +++++----- parts/astyle/astyle_widget.cpp | 12 ++++++------ 5 files changed, 22 insertions(+), 22 deletions(-) (limited to 'parts/astyle') diff --git a/parts/astyle/astyle_adaptor.cpp b/parts/astyle/astyle_adaptor.cpp index 05fb0901..49ff81a8 100644 --- a/parts/astyle/astyle_adaptor.cpp +++ b/parts/astyle/astyle_adaptor.cpp @@ -38,9 +38,9 @@ string ASStringIterator::nextLine() } -KDevFormatter::KDevFormatter(const TQMap& options) +KDevFormatter::KDevFormatter(const TQStringVariantMap& options) { -// for ( TQMap::ConstIterator iter = options.begin();iter != options.end();iter++ ) +// for ( TQStringVariantMap::ConstIterator iter = options.begin();iter != options.end();iter++ ) // { // kdDebug ( 9009 ) << "format: " << iter.key() << "=" << iter.data() << endl; // } diff --git a/parts/astyle/astyle_adaptor.h b/parts/astyle/astyle_adaptor.h index 21398fbb..d1cb4e61 100644 --- a/parts/astyle/astyle_adaptor.h +++ b/parts/astyle/astyle_adaptor.h @@ -37,7 +37,7 @@ class KDevFormatter : public astyle::ASFormatter { public: - KDevFormatter(const TQMap& options); + KDevFormatter(const TQStringVariantMap& options); KDevFormatter( AStyleWidget * widget ); TQString indentString() const { diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp index 16d590ab..f5b5e2e7 100644 --- a/parts/astyle/astyle_part.cpp +++ b/parts/astyle/astyle_part.cpp @@ -101,7 +101,7 @@ void AStylePart::loadGlobal() } -// for (TQMap::iterator iter = m_global.begin();iter != m_global.end();iter++) +// for (TQStringVariantMap::iterator iter = m_global.begin();iter != m_global.end();iter++) // { // kdDebug(9009) << "load: " <::iterator iter = m_project.begin();iter != m_project.end();iter++) +// for (TQStringVariantMap::iterator iter = m_project.begin();iter != m_project.end();iter++) // { // kdDebug(9009) << "project before: " <sync(); -// for (TQMap::iterator iter = m_global.begin();iter != m_global.end();iter++) +// for (TQStringVariantMap::iterator iter = m_global.begin();iter != m_global.end();iter++) // { // kdDebug(9009) << "global after: " <::iterator iter = m_project.begin();iter != m_project.end();iter++) + for (TQStringVariantMap::iterator iter = m_project.begin();iter != m_project.end();iter++) { style.setAttribute(iter.key(),iter.data().toString()); } diff --git a/parts/astyle/astyle_part.h b/parts/astyle/astyle_part.h index 61b5a382..f5a79485 100644 --- a/parts/astyle/astyle_part.h +++ b/parts/astyle/astyle_part.h @@ -30,7 +30,7 @@ public: AStylePart(TQObject *parent, const char *name, const TQStringList &); ~AStylePart(); - TQString formatSource(const TQString text, AStyleWidget * widget, const TQMap& options); + TQString formatSource(const TQString text, AStyleWidget * widget, const TQStringVariantMap& options); virtual TQString formatSource(const TQString text); TQString indentString() const; void saveGlobal(); @@ -40,8 +40,8 @@ public: void restorePartialProjectSession(const TQDomElement * el); void savePartialProjectSession(TQDomElement * el); - TQMap& getProjectOptions(){return m_project;} - TQMap& getGlobalOptions(){return m_global;} + TQStringVariantMap& getProjectOptions(){return m_project;} + TQStringVariantMap& getGlobalOptions(){return m_global;} private slots: @@ -65,8 +65,8 @@ private: TDEAction *formatFileAction; // the configurable options. - TQMap m_project; - TQMap m_global; + TQStringVariantMap m_project; + TQStringVariantMap m_global; TQStringList m_projectExtensions; TQStringList m_globalExtensions; TQMap m_searchExtensions; diff --git a/parts/astyle/astyle_widget.cpp b/parts/astyle/astyle_widget.cpp index a70c6771..6959fe7b 100644 --- a/parts/astyle/astyle_widget.cpp +++ b/parts/astyle/astyle_widget.cpp @@ -53,7 +53,7 @@ AStyleWidget::AStyleWidget(AStylePart * part, bool global, TQWidget *parent, con connect(Keep_Blocks, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged())); - TQMap option; + TQStringVariantMap option; if ( isGlobalWidget){ Style_Global->hide(); option = m_part->getGlobalOptions(); @@ -172,7 +172,7 @@ AStyleWidget::~AStyleWidget() void AStyleWidget::accept() { - TQMap* m_option; + TQStringVariantMap* m_option; if ( isGlobalWidget){ m_option = &(m_part->getGlobalOptions()); m_part->setExtensions(GeneralExtension->text(),true); @@ -195,8 +195,8 @@ void AStyleWidget::accept() else if (Style_JAVA->isChecked()) (*m_option)["FStyle"] = "JAVA"; else if (Style_Global->isChecked()){ - TQMap& global = m_part->getGlobalOptions(); - TQMap& project = m_part->getProjectOptions(); + TQStringVariantMap& global = m_part->getGlobalOptions(); + TQStringVariantMap& project = m_part->getProjectOptions(); project=global; project["FStyle"]="GLOBAL"; } @@ -264,7 +264,7 @@ void AStyleWidget::accept() } if ( isGlobalWidget){ - TQMap& project = m_part->getProjectOptions(); + TQStringVariantMap& project = m_part->getProjectOptions(); if ( project["FStyle"] == "GLOBAL"){ project = m_part->getGlobalOptions(); project["FStyle"] = "GLOBAL"; @@ -272,7 +272,7 @@ void AStyleWidget::accept() m_part->saveGlobal(); } -// for ( TQMap::ConstIterator iter = m_option->begin();iter != m_option->end();iter++ ) +// for ( TQStringVariantMap::ConstIterator iter = m_option->begin();iter != m_option->end();iter++ ) // { // kdDebug ( 9009 ) << "widget: " << iter.key() << "=" << iter.data() << endl; // } -- cgit v1.2.1