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

List:       kde-commits
Subject:    KDE/kdevplatform
From:       David Faure <faure () kde ! org>
Date:       2009-11-26 15:15:35
Message-ID: 1259248535.078716.24876.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1054711 by dfaure:

Fix compilation with strict iterators.


 M  +2 -2      plugins/contextbrowser/contextbrowser.cpp  
 M  +2 -2      plugins/patchreview/libdiff2/komparemodellist.cpp  
 M  +4 -4      plugins/patchreview/libdiff2/kompareprocess.cpp  
 M  +6 -6      plugins/patchreview/patchreview.cpp  
 M  +1 -1      shell/launchconfigurationdialog.cpp  


--- trunk/KDE/kdevplatform/plugins/contextbrowser/contextbrowser.cpp #1054710:1054711
@@ -728,7 +728,7 @@
     registerAsRangeWatcher(job->duChain());
   }
   
-  for(QMap< View*, DeclarationPointer >::const_iterator it = \
m_highlightedDeclarations.begin(); it != m_highlightedDeclarations.end(); ++it) { +  \
for(QMap< View*, DeclarationPointer >::const_iterator it = \
m_highlightedDeclarations.constBegin(); it != m_highlightedDeclarations.constEnd(); \
++it) {  if(it.key()->document()->url() == job->document().toUrl()) {
       if(m_updateViews.isEmpty())
         m_updateTimer->start(highlightingTimeout);
@@ -1054,7 +1054,7 @@
 {
   QWidget* master = masterWidget(widgetInWindow);
   
-  for(QList< QPointer< QWidget > >::iterator it = m_toolbarWidgets.begin(); it != \
m_toolbarWidgets.end(); ++it) { +  for(QList< QPointer< QWidget > >::const_iterator \
it = m_toolbarWidgets.constBegin(); it != m_toolbarWidgets.constEnd(); ++it) {  \
if((*it) && masterWidget(*it) == master) {  return *it;
     }
--- trunk/KDE/kdevplatform/plugins/patchreview/libdiff2/komparemodellist.cpp \
#1054710:1054711 @@ -965,8 +965,8 @@
 
 	QStringList lines = split( fileContents );
 
-	QStringList::ConstIterator linesIt = lines.begin();
-	QStringList::ConstIterator lEnd    = lines.end();
+	QStringList::ConstIterator linesIt = lines.constBegin();
+	QStringList::ConstIterator lEnd    = lines.constEnd();
 
 	DiffHunkList* hunks = model->hunks();
 	kDebug(8101) << "Hunks in hunklist:" << hunks->count();
--- trunk/KDE/kdevplatform/plugins/patchreview/libdiff2/kompareprocess.cpp \
#1054710:1054711 @@ -195,8 +195,8 @@
 
 	if ( m_diffSettings->m_excludeFilePattern )
 	{
-		QStringList::ConstIterator it = m_diffSettings->m_excludeFilePatternList.begin();
-		QStringList::ConstIterator end = m_diffSettings->m_excludeFilePatternList.end();
+		QStringList::ConstIterator it = \
m_diffSettings->m_excludeFilePatternList.constBegin(); +		QStringList::ConstIterator \
end = m_diffSettings->m_excludeFilePatternList.constEnd();  for ( ; it != end; ++it )
 		{
 			m_args << "-x" << *it ;
@@ -241,8 +241,8 @@
 {
 #ifndef NDEBUG
 	QString cmdLine;
-	QStringList::ConstIterator it = m_args.begin();
-	for (; it != m_args.end(); ++it )
+	QStringList::ConstIterator it = m_args.constBegin();
+	for (; it != m_args.constEnd(); ++it )
 		cmdLine += "\"" + (*it) + "\" ";
 	kDebug(8101) << cmdLine;
 #endif
--- trunk/KDE/kdevplatform/plugins/patchreview/patchreview.cpp #1054710:1054711
@@ -285,7 +285,7 @@
                     Q_ASSERT(smart);
                     QMutexLocker lock(smart->smartMutex());
 
-                    QList< KTextEditor::SmartRange* > ranges = \
m_highlighters[doc->url()]->ranges(); +                    const QList< \
KTextEditor::SmartRange* > ranges = m_highlighters[doc->url()]->ranges();  
                     KTextEditor::View * v = doc->textDocument() ->activeView();
                     int bestLine = -1;
@@ -476,9 +476,9 @@
     const Diff2::DiffModelList* models = m_plugin->modelList()->models();
     if ( !models )
         throw "no diff-models";
-    Diff2::DiffModelList::const_iterator it = models->begin();
+    Diff2::DiffModelList::const_iterator it = models->constBegin();
     QSet<KUrl> haveUrls;
-    while ( it != models->end() ) {
+    while ( it != models->constEnd() ) {
         Diff2::DifferenceList * diffs = ( *it ) ->differences();
         int cnt = 0;
         if ( diffs )
@@ -510,7 +510,7 @@
     ///findProject() excludes some useless files like backups, so we can use that to \
sort those files to the back  for(int withProject = 1; withProject >= 0; \
--withProject)  {
-      for(QMap<KUrl, QString>::const_iterator it = additionalUrls.begin(); it != \
additionalUrls.end(); ++it) +      for(QMap<KUrl, QString>::const_iterator it = \
additionalUrls.constBegin(); it != additionalUrls.constEnd(); ++it)  {
         KUrl url = it.key();
         
@@ -745,7 +745,7 @@
 
 KTextEditor::SmartRange* PatchHighlighter::rangeForMark(KTextEditor::Mark mark)
 {
-    for(QMap< KTextEditor::SmartRange*, Diff2::Difference* >::const_iterator it = \
m_differencesForRanges.begin(); it != m_differencesForRanges.end(); ++it) { +    \
for(QMap< KTextEditor::SmartRange*, Diff2::Difference* >::const_iterator it = \
m_differencesForRanges.constBegin(); it != m_differencesForRanges.constEnd(); ++it) { \
if(it.key()->start().line() == mark.line)  {
         return it.key();
@@ -840,7 +840,7 @@
 
     topRange->addWatcher(this);
     
-    for ( Diff2::DifferenceList::const_iterator it = m_model->differences() \
->begin(); it != m_model->differences() ->end(); ++it ) { +    for ( \
Diff2::DifferenceList::const_iterator it = m_model->differences() ->constBegin(); it \
!= m_model->differences() ->constEnd(); ++it ) {  Diff2::Difference* diff = *it;
         int line, lineCount;
         Diff2::DifferenceStringList lines ;
--- trunk/KDE/kdevplatform/shell/launchconfigurationdialog.cpp #1054710:1054711
@@ -749,7 +749,7 @@
     } else if( !mode && config && index.column() == 1 )
     {
         KComboBox* box = new KComboBox( parent );
-        QList<LaunchConfigurationType*> types = \
Core::self()->runController()->launchConfigurationTypes(); +        const \
QList<LaunchConfigurationType*> types = \
                Core::self()->runController()->launchConfigurationTypes();
         for( QList<LaunchConfigurationType*>::const_iterator it = types.begin(); it \
!= types.end(); it++ )  {
             box->addItem( (*it)->name(), (*it)->id() );


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