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

List:       kdevelop-bugs
Subject:    [Bug 140726] ctags plugin tries to run "-R" when ctags binary setting
From:       Jens Dagerbo <jens.dagerbo () swipnet ! se>
Date:       2007-01-27 17:55:09
Message-ID: 20070127175509.9890.qmail () ktown ! kde ! org
[Download RAW message or body]

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
         
http://bugs.kde.org/show_bug.cgi?id=140726         
jens.dagerbo swipnet se changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From jens.dagerbo swipnet se  2007-01-27 18:55 -------
SVN commit 627687 by dagerbo:

Don't attempt to use an empty string as ctags command 

BUG: 140726

 M  +5 -1      ctags2_part.cpp  
 M  +5 -1      ctags2_settingswidget.cpp  


--- branches/kdevelop/3.4/parts/ctags2/ctags2_part.cpp #627686:627687
 @ -149,7 +149,11  @
 	// get name of the ctags binary
 	KConfig * config = kapp->config();
 	config->setGroup( "CTAGS" );
-	QString ctagsBinary = config->readEntry( "ctags binary", "ctags" ).stripWhiteSpace();
+	QString ctagsBinary = config->readEntry( "ctags binary" ).stripWhiteSpace();
+	if ( ctagsBinary.isEmpty() )
+	{
+		ctagsBinary = "ctags";
+	}
 
 	// set a default argument list
 	QString argsDefault = "-R --c++-types=+px --excmd=pattern --exclude=Makefile --exclude=.";
--- branches/kdevelop/3.4/parts/ctags2/ctags2_settingswidget.cpp #627686:627687
 @ -79,7 +79,11  @
 	showDefinitionBox->setChecked( config->readBoolEntry( "ShowDefinition", true ) );
 	showLookupBox->setChecked( config->readBoolEntry( "ShowLookup", true ) );
 	jumpToFirstBox->setChecked( config->readBoolEntry( "JumpToFirst", false ) );
-	binaryPath->setURL( config->readEntry( "ctags binary" ) );
+	QString ctagsBinary = config->readEntry( "ctags binary" ).stripWhiteSpace();
+	if ( !ctagsBinary.isEmpty() )
+	{
+		binaryPath->setURL( ctagsBinary );
+	}
 
 	config->setGroup( "CTAGS-tagsfiles" );
 	QMap<QString,QString> entryMap = config->entryMap( "CTAGS-tagsfiles" );


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