fix for broken CMakeOutputWidget (2.1.2cvs)

[Roland Krause]

I updated to current cvs and the coutputwidget is broken again.
I will now revert Falk's last changes. 
Roland


--- "F at lk Brettschneider" <falk.brettschneider at gmx.de> wrote:
> Hi!
> A patch is attached fixing three newly broken issues with the output 
> tool-view happened with my Qt-3.0.3. I've got SuSE-8.0 (Qt-3.0.3, 
> KDE-3.0.0), so please also test it with newer Qt/KDE versions! I
> tested 
> it with KDE-2 and it works well there, too. I already committed
> because 
> of the running timeout until the KDE-3.0.2 release.
> A second patch is attached fixing compile errors Kuba Ober's latest 
> patch for compiling single files (Custom projects) on KDE-2.2. Kuba, 
> what is the missing part for KDE-2?
> Ciao
> F at lk
> 
> > Index: coutputwidget.cpp
> ===================================================================
> RCS file: /home/kde/kdevelop/kdevelop/coutputwidget.cpp,v
> retrieving revision 1.3.2.4.2.10.2.21
> retrieving revision 1.3.2.4.2.10.2.22
> diff -r1.3.2.4.2.10.2.21 -r1.3.2.4.2.10.2.22
> 81a82,83
> >   setWordWrap(WidgetWidth); // -JROC
> >   setWrapPolicy(Anywhere); // -JROC
> 84d85
> <   setWordWrap(NoWrap);
> 88,90d88
> < #else
> <   setWordWrap(WidgetWidth); // -JROC
> <   setWrapPolicy(Anywhere); // -JROC
> 108a107
> >     bool displayAdditions=atEnd();
> 114d112
> <     bool displayAdditions=atEnd();
> 126a125,127
> > #if QT_VERSION < 304
> >     int paraCount = paragraphs()-1;
> > #else
> 128c129
> <     bool displayAdditions = (paraCount-1 == currentPara);
> ---
> > #endif    
> 144,152c145,150
> < //  (rokrau 05/31/02) nasty, nasty
> < #if QT_VERSION == 304
> <           if (line[0] != '\n') {
> < #endif
> <             line ="<font color=\"black\">" + line + "</font>";
> <             append(line);
> < #if QT_VERSION == 304
> <           }
> < #endif
> ---
> >         // Runtime check for broken Qt version. Don't add empty new
> lines.
> >         if (line[0]=='\n' && strncmp(qVersion(), "3.0.4",
> sizeof("3.0.4")) == 0)
> >           break;
> >           
> >         line ="<font color=\"black\">" + line + "</font>";
> >         append(line);
> 157c155
> <       setCursorPosition(paraCount, 0);
> ---
> >       setCursorPosition(paraCount+1, 0);
> 293a292,294
> > #if QT_VERSION < 304
> >     m_errorMap.insert(numLines()-1, errorDetails);
> > #else
> 294a296
> > #endif    
> > Index: ckdevelop.cpp
> ===================================================================
> RCS file: /home/kde/kdevelop/kdevelop/ckdevelop.cpp,v
> retrieving revision 1.158.2.114.2.140.2.42
> diff -u -r1.158.2.114.2.140.2.42 ckdevelop.cpp
> --- ckdevelop.cpp	2002/06/10 15:56:11	1.158.2.114.2.140.2.42
> +++ ckdevelop.cpp	2002/06/11 23:50:04
> @@ -1016,7 +1016,11 @@
>      cwd = QDir(cwd).absPath();
>      // Invoke make with proper options
>      debug("run: %s in: %s", make_cmd.data(), cwd.data());
> +#if QT_VERSION < 300
> +    // TODO: set working directory of process, how to do?
> +#else
>      process.setWorkingDirectory(cwd);
> +#endif
>      process << make_cmd;
>      QString makeOptions = prj->getMakeOptions();
>      if (gotMakefile &&
> 

__________________________________________________
Do You Yahoo!?
Yahoo! - Official partner of 2002 FIFA World Cup
http://fifaworldcup.yahoo.com