con 
							
						 
					 
					
						
						
							
						
						1dcabe5a3a 
					 
					
						
						
							
							Merge branch '1.0.0'  
						
						 
						
						... 
						
						
						
						Conflicts:
	tests/auto/cplusplus/shared/shared.pri
	tests/auto/cplusplus/shared/shared.pro 
						
						
					 
					
						2009-02-09 10:54:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias Ettrich 
							
						 
					 
					
						
						
							
						
						87b8a97447 
					 
					
						
						
							
							fix off by one when selecting block up or the previous open parenthesis.  
						
						 
						
						
						
						
					 
					
						2009-02-04 19:08:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mae 
							
						 
					 
					
						
						
							
						
						b9655fd1bc 
					 
					
						
						
							
							editormanager cleanups  
						
						 
						
						
						
						
					 
					
						2009-01-30 17:10:22 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						15ac83eda4 
					 
					
						
						
							
							Fixes:    fakevim: add flags to settings page  
						
						 
						
						
						
						
					 
					
						2009-01-23 18:21:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thorbjørn Lindeijer 
							
						 
					 
					
						
						
							
						
						6adecf3767 
					 
					
						
						
							
							Avoid going through ICore when it's not necessary  
						
						 
						
						... 
						
						
						
						Many singletons have their own instance() method, in which case there is
no need to use ICore::instance() to get access to them. 
						
						
					 
					
						2009-01-21 15:55:33 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						113b81e9db 
					 
					
						
						
							
							replace ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>() by Core::ICore::instance()  
						
						 
						
						
						
						
					 
					
						2009-01-20 11:52:04 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						cc5ff1ec74 
					 
					
						
						
							
							Remove #include <extensionsystem/pluginmanager.h> from icore.h, a  
						
						 
						
						... 
						
						
						
						forward declaration is sufficient. 
						
						
					 
					
						2009-01-19 12:39:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						14276f72ff 
					 
					
						
						
							
							Fixes: Warning on MSVC, no not temporary convert to int.  
						
						 
						
						... 
						
						
						
						RevBy: Matthias 
						
						
					 
					
						2009-01-15 16:52:12 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						59affcfffc 
					 
					
						
						
							
							Bump year in licence header.  
						
						 
						
						
						
						
					 
					
						2009-01-13 19:22:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thorbjørn Lindeijer 
							
						 
					 
					
						
						
							
						
						719894044d 
					 
					
						
						
							
							Keep completion popup on the screen  
						
						 
						
						... 
						
						
						
						Pop it upwards when it would otherwise go below the screen and shift it
to the left when it would otherwise exit the screen on the right. 
						
						
					 
					
						2008-12-18 17:02:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						da3cb14483 
					 
					
						
						
							
							chancge Nokia GPL exception version from 1.2 to 1.3  
						
						 
						
						
						
						
					 
					
						2008-12-16 17:20:00 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thorbjørn Lindeijer 
							
						 
					 
					
						
						
							
						
						4c04c1a774 
					 
					
						
						
							
							Fixed mouse handling for code folding when hidden  
						
						 
						
						... 
						
						
						
						The mouse handling for code folding wasn't deactivated when the code
folding markers were hidden.
Reviewed-by: mae 
						
						
					 
					
						2008-12-15 17:08:50 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mae 
							
						 
					 
					
						
						
							
						
						ffc082a3b3 
					 
					
						
						
							
							small fix for collapse/expand  
						
						 
						
						
						
						
					 
					
						2008-12-12 18:25:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mae 
							
						 
					 
					
						
						
							
						
						d937ee5570 
					 
					
						
						
							
							tweak collapse/expand short cuts, and do not draw collpase boxes  
						
						 
						
						... 
						
						
						
						in ifdefed out sections 
						
						
					 
					
						2008-12-12 14:09:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mae 
							
						 
					 
					
						
						
							
						
						18c8471158 
					 
					
						
						
							
							line is blockNumber + 1  
						
						 
						
						
						
						
					 
					
						2008-12-11 15:50:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mae 
							
						 
					 
					
						
						
							
						
						46535482d0 
					 
					
						
						
							
							Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta  
						
						 
						
						
						
						
					 
					
						2008-12-11 14:12:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mae 
							
						 
					 
					
						
						
							
						
						9890705295 
					 
					
						
						
							
							make the home key jump to column 0 if the caret if before the first non-space  
						
						 
						
						
						
						
					 
					
						2008-12-11 14:11:28 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mae 
							
						 
					 
					
						
						
							
						
						6adb3f617e 
					 
					
						
						
							
							connect the parenthesis matcher with the ifdefed out information.  
						
						 
						
						
						
						
					 
					
						2008-12-11 13:20:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						f1e67fa3a3 
					 
					
						
						
							
							Added `editorKind' to BaseTextEditor::openEditorAt(). We need it to force the CPPEDITOR kind  
						
						 
						
						... 
						
						
						
						when opening files from the C++ editor (e.g. when the user press F2 on #include <QMutex>). 
						
						
					 
					
						2008-12-11 10:28:39 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mae 
							
						 
					 
					
						
						
							
						
						8580234ec8 
					 
					
						
						
							
							added Move Line Up and Move Line Down actions. Can be extended to  
						
						 
						
						... 
						
						
						
						support statements later. 
						
						
					 
					
						2008-12-10 18:01:33 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mae 
							
						 
					 
					
						
						
							
						
						1931304da1 
					 
					
						
						
							
							add explicit "Clean Whitespace" advanced action  
						
						 
						
						
						
						
					 
					
						2008-12-09 17:43:31 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mae 
							
						 
					 
					
						
						
							
						
						cab48e0d7c 
					 
					
						
						
							
							Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta  
						
						 
						
						
						
						
					 
					
						2008-12-09 15:42:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mae 
							
						 
					 
					
						
						
							
						
						23872bb997 
					 
					
						
						
							
							make indenting the selection a single undo/redo command  
						
						 
						
						
						
						
					 
					
						2008-12-09 15:41:01 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						4a552ead9f 
					 
					
						
						
							
							use QTC_ASSERT instead of Q_ASSERT  
						
						 
						
						
						
						
					 
					
						2008-12-09 15:25:01 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thorbjørn Lindeijer 
							
						 
					 
					
						
						
							
						
						756de96d99 
					 
					
						
						
							
							Don't clip the right margin indication  
						
						 
						
						... 
						
						
						
						Doesn't look right, since it causes some background to show through
between the indicator and the scrollbar. 
						
						
					 
					
						2008-12-09 12:12:21 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mae 
							
						 
					 
					
						
						
							
						
						9ef62848ac 
					 
					
						
						
							
							avoid parentheses matching flicker when navigationt to block end / start.  
						
						 
						
						
						
						
					 
					
						2008-12-05 17:06:17 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mae 
							
						 
					 
					
						
						
							
						
						6d37029be8 
					 
					
						
						
							
							support different selection kinds in basetexteditor.  
						
						 
						
						... 
						
						
						
						enum ExtraSelectionKind {
        CurrentLineSelection,
        ParenthesesMatchingSelection,
        CodeWarningsSelection,
        CodeSemanticsSelection,
        OtherSelection,
        NExtraSelectionKinds
    };
    void setExtraSelections(ExtraSelectionKind kind, const QList<QTextEdit::ExtraSelection> &selections);
    QList<QTextEdit::ExtraSelection> extraSelections(ExtraSelectionKind kind) const;
This is mainly for the benefit of the cppmodelmanager. 
						
						
					 
					
						2008-12-05 13:19:57 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mae 
							
						 
					 
					
						
						
							
						
						786e183aa6 
					 
					
						
						
							
							markContextMenuRequested signal in ITextEditor  
						
						 
						
						
						
						
					 
					
						2008-12-05 12:12:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mae 
							
						 
					 
					
						
						
							
						
						923bfa52d3 
					 
					
						
						
							
							Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta  
						
						 
						
						
						
						
					 
					
						2008-12-04 19:35:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mae 
							
						 
					 
					
						
						
							
						
						4fd9f1e6f7 
					 
					
						
						
							
							new signal: BaseTextEditor::lineContextMenuRequested(TextEditor::ITextEditor *editor, int line, QMenu *menu);  
						
						 
						
						... 
						
						
						
						To be useful and used by the bookmarkmanager, this has to move to ITextEditor. 
						
						
					 
					
						2008-12-04 19:33:23 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mae 
							
						 
					 
					
						
						
							
						
						e594815842 
					 
					
						
						
							
							two new actions: "select block up" and "select block down", current default is Ctrl+U  
						
						 
						
						
						
						
					 
					
						2008-12-04 19:25:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mae 
							
						 
					 
					
						
						
							
						
						e9ad023def 
					 
					
						
						
							
							block navigation and selection (bound to Ctrl+[]{}  
						
						 
						
						
						
						
					 
					
						2008-12-04 18:37:02 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thorbjørn Lindeijer 
							
						 
					 
					
						
						
							
						
						cecd5023dd 
					 
					
						
						
							
							First incarnation of classes quickopen filter  
						
						 
						
						... 
						
						
						
						Invokable with 'c', currently shows all classes it can find. 
						
						
					 
					
						2008-12-04 18:22:58 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						cf11b69643 
					 
					
						
						
							
							more code cosmetics  
						
						 
						
						
						
						
					 
					
						2008-12-02 16:19:05 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						ab83dcd87c 
					 
					
						
						
							
							off-by-one in headers  
						
						 
						
						
						
						
					 
					
						2008-12-02 14:20:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						8a43d9b9f3 
					 
					
						
						
							
							end-of-line whitespace correction of the new headers  
						
						 
						
						
						
						
					 
					
						2008-12-02 14:17:16 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						05c35356ab 
					 
					
						
						
							
							Initial import  
						
						 
						
						
						
						
					 
					
						2008-12-02 12:01:29 +01:00