[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/kdevelop/3.4/parts/astyle
From:       Megan Webb <kdeveloper.megan () gmail ! com>
Date:       2006-12-10 11:55:10
Message-ID: 1165751710.251328.8819.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 612100 by webb:

Preserve the order of the options in the extension selector.
The top option is the default one.


 M  +25 -41    astyle_part.cpp  
 M  +2 -1      astyle_part.h  
 M  +1 -1      astyle_widget.cpp  


--- branches/kdevelop/3.4/parts/astyle/astyle_part.cpp #612099:612100
@@ -73,7 +73,8 @@
   //use the globals first, project level will override later..
   m_project=m_global;
 
-  setExtensions("*.C *.H *.c *.c++ *.cc *.cpp *.cxx *.diff *.h *.h++ *.hh *.hpp \
*.hxx *.inl *.java *.moc *.patch *.tlh *.xpm"); +  QString defaultExt="*.cpp *.h,*.c \
*.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff \
,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm"; +  setExtensions(defaultExt);
   // maybe there is a file open already
   activePartChanged( partController()->activePart() );
 
@@ -254,44 +255,40 @@
 }
 
 QString AStylePart::getExtensions(){
-	QString values;
-	int count=0;
-	 for (QMap<QString, QString>::iterator iter = m_extensions.begin();iter != \
                m_extensions.end();iter++)
-     {
-		QString ext = iter.data();
-		values.append(ext);
-		values.append(" ");
-		if ( count++ == 1){
-			values.append('\n');
-			count=0;
-		}
-	}
-	values += " ";
+	QString values = m_displayExtensions.join("\n");
 	kdDebug(9009) << "getExtensions " << values<<endl;
 	return values.stripWhiteSpace();
 }
 
+/**
+ * Extensions from the widget passed in.
+ * We preserve the order, so common extensions will
+ * end up at the top
+ * @param ext
+ */
 void AStylePart::setExtensions ( QString ext )
 {
 	kdDebug(9009) << "setExtensions " << ext<<endl;
-	m_extensions.clear();
-	QStringList extensions = QStringList::split ( " ", ext );
-	for ( QStringList::Iterator iter = extensions.begin(); iter != extensions.end(); \
iter++ ) +	m_searchExtensions.clear();
+	m_displayExtensions.clear();
+	m_displayExtensions = QStringList::split ( QRegExp("\n"), ext );
+	QStringList bits = QStringList::split(QRegExp("\\s+"),ext);
+	for ( QStringList::Iterator iter = bits.begin(); iter != bits.end(); iter++ )
 	{
 		QString ending=*iter;
 		if ( ending.startsWith ( "*" ) )
 		{
 			if (ending.length() ==1 ){
 				// special case.. any file.
-				m_extensions.insert(ending, ending);
+				m_searchExtensions.insert(ending, ending);
 			}
 			else{
-				m_extensions.insert( ending.mid( 1 ), ending);
+				m_searchExtensions.insert( ending.mid( 1 ), ending);
 			}
 		}
 		else
 		{
-			m_extensions.insert(ending, ending);
+			m_searchExtensions.insert(ending, ending);
 		}
 	}
 }
@@ -309,14 +306,14 @@
 		if ( iface )
 		{
 			// check for the everything case..
-			if ( m_extensions.find ( "*" ) == m_extensions.end() )
+			if ( m_searchExtensions.find ( "*" ) == m_searchExtensions.end() )
 			{
 				QString extension = rw_part->url().path();
 				int pos = extension.findRev ( '.' );
 				if ( pos >= 0 )
 				{
 					extension = extension.mid ( pos );
-					enabled = ( m_extensions.find ( extension ) != m_extensions.end() );
+					enabled = ( m_searchExtensions.find ( extension ) != m_searchExtensions.end() \
);  }
 			}
 			else
@@ -417,11 +414,11 @@
 		}
 	}
 	QDomElement exten = el->namedItem("Extensions").toElement();
-	QString ext = exten.attribute("ext");
-	if ( ext.isEmpty() || ext.stripWhiteSpace().isEmpty()){
-		ext="*.C *.H *.c *.c++ *.cc *.cpp *.cxx *.diff *.h *.h++ *.hh *.hpp *.hxx *.inl \
*.java *.moc *.patch *.tlh *.xpm"; +	QString ext = \
exten.attribute("ext").simplifyWhiteSpace(); +	if ( ext.isEmpty()){
+		ext="*.cpp *.h,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff \
,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm";  }
-	setExtensions(ext);
+	setExtensions(ext.replace(QChar(','), QChar('\n')));
 }
 
 
@@ -441,12 +438,7 @@
 		}
 	}
 	QDomElement exten = domDoc.createElement ( "Extensions" );
-	QString values;
-	for ( QMap<QString, QString>::iterator iter = m_extensions.begin();iter != \
                m_extensions.end();iter++ )
-	{
-		values += ( iter.data() ) + " ";
-	}
-	exten.setAttribute ( "ext", values );
+	exten.setAttribute ( "ext", m_displayExtensions.join(",").simplifyWhiteSpace() );
 
 	el->appendChild(style);
 	el->appendChild(exten);
@@ -476,15 +468,12 @@
 	}
 
 	uint processed = 0;
-	KProgressDialog *prog = new KProgressDialog ( 0, "dialog", i18n ( "Formatting \
                files.." ), "", true );
-	prog->setMinimumDuration(100);
-	prog->show();
 	for ( uint fileCount = 0; fileCount < m_urls.size(); fileCount++ )
 	{
 		QString fileName = m_urls[fileCount].pathOrURL();
 
 		bool found = false;
-		for ( QMap<QString, QString>::Iterator it = m_extensions.begin(); it != \
m_extensions.end(); ++it ) +		for ( QMap<QString, QString>::Iterator it = \
m_searchExtensions.begin(); it != m_searchExtensions.end(); ++it )  {
 			QRegExp re ( it.data(), true, true );
 			if ( re.search ( fileName ) == 0 && ( uint ) re.matchedLength() == \
fileName.length() ) @@ -497,9 +486,6 @@
 		if ( found )
 		{
 			QString backup = fileName + "#";
-			prog->setLabel ( i18n ( "Processing file: %1" ).arg ( fileName ) );
-			prog->progressBar()->setValue ( (fileCount+1 / m_urls.size()-1)*100 );
-
 			QFile fin ( fileName );
 			QFile fout ( backup );
 			if ( fin.open ( IO_ReadOnly ) )
@@ -525,8 +511,6 @@
 			}
 		}
 	}
-	prog->hide();
-	delete prog;
 	if ( processed != 0 )
 	{
 		KMessageBox::information ( 0, i18n ( "Processed %1 files ending with extensions \
                %2" ).arg ( processed ).arg(getExtensions().stripWhiteSpace()) );
--- branches/kdevelop/3.4/parts/astyle/astyle_part.h #612099:612100
@@ -65,7 +65,8 @@
   // the configurable options.
   QMap<QString, QVariant>  m_project;
   QMap<QString, QVariant> m_global;
-  QMap<QString, QString> m_extensions;
+  QMap<QString, QString> m_searchExtensions;
+  QStringList m_displayExtensions;
   KURL::List m_urls;
 
 
--- branches/kdevelop/3.4/parts/astyle/astyle_widget.cpp #612099:612100
@@ -167,7 +167,7 @@
   }
   else{
 	m_option = &(m_part->getProjectOptions());
-	m_part->setExtensions(GeneralExtension->text().simplifyWhiteSpace());
+	m_part->setExtensions(GeneralExtension->text());
   }
 
 


[prev in list] [next in list] [prev in thread] [next in thread]