CVS commit by mueller: build fixes. I don't know why foo + + bar compiles for anyone. M +2 -2 ccconfigwidget.cpp 1.2 M +1 -1 codeinformationrepository.cpp 1.2 M +1 -1 doxydoc.cpp 1.3 M +2 -2 javanewclassdlg.cpp 1.2 --- kdevelop/parts/javasupport/ccconfigwidget.cpp #1.1:1.2 @@ -87,6 +87,6 @@ void CCConfigWidget::initFTTab( ) implementation_suffix->setText(DomUtil::readEntry(dom, "/javasupportpart/filetemplates/implementationsuffix", ".java")); lowercase_filenames->setChecked(DomUtil::readBoolEntry(dom, "/javasupportpart/filetemplates/lowercasefilenames", true)); - interface_url->fileDialog()->setURL(KURL(*m_pPart->project()->projectDirectory())); - implementation_url->fileDialog()->setURL(KURL(*m_pPart->project()->projectDirectory())); + interface_url->fileDialog()->setURL(KURL(m_pPart->project()->projectDirectory())); + implementation_url->fileDialog()->setURL(KURL(m_pPart->project()->projectDirectory())); } --- kdevelop/parts/javasupport/codeinformationrepository.cpp #1.1:1.2 @@ -280,5 +280,5 @@ QValueListtext(0).isEmpty()) // if ((!childClass) || (it.current()->text(0) != "QWidget")) - includeBaseHeader += (includeBaseHeader.isEmpty() ? QString(""): QString("\n")) + "#include " + + includeBaseHeader += (includeBaseHeader.isEmpty() ? QString(""): QString("\n")) + QString::fromLatin1( "#include " ) + (it.current()->text(2).toInt() == 0 ? QString("<") : QString("\"")) - + it.current()->text(3) + + + it.current()->text(3) + (it.current()->text(2).toInt() == 0 ? QString(">") : QString("\"")); ++it;