[arch-commits] Commit in kdevelop/trunk (kdev_fix_hang_3.4.1.patch post-3.5.9.patch)

[Travis Willard]

    Date: Sunday, June 22, 2008 @ 15:48:42
  Author: travis
Revision: 3463

upgpkg: kdevelop 3.5.2-1
    Upstream update

Deleted:
  kdevelop/trunk/kdev_fix_hang_3.4.1.patch
  kdevelop/trunk/post-3.5.9.patch

---------------------------+
 kdev_fix_hang_3.4.1.patch |   54 --------------------------------------------
 post-3.5.9.patch          |   49 ---------------------------------------
 2 files changed, 103 deletions(-)

Deleted: kdev_fix_hang_3.4.1.patch
===================================================================
--- kdev_fix_hang_3.4.1.patch	2008-06-22 19:46:55 UTC (rev 3462)
+++ kdev_fix_hang_3.4.1.patch	2008-06-22 19:48:42 UTC (rev 3463)
@@ -1,54 +0,0 @@
-diff -u -u kdevelop-3.4.1/languages/cpp/cppsupportpart.cpp kdevelop-svn/languages/cpp/cppsupportpart.cpp
---- kdevelop-3.4.1/languages/cpp/cppsupportpart.cpp	2007-05-16 16:36:20.000000000 +0200
-+++ kdevelop-svn/languages/cpp/cppsupportpart.cpp	2007-05-16 00:25:57.000000000 +0200
-@@ -3130,11 +3130,11 @@
-         return QString::null;
- }
- 
--UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& parent ) : QThread(), m_parent( parent ) {
-+UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& parent ) : QThread(), m_parent( parent ), m_stop(false) {
- }
-       
- void UIBlockTester::UIBlockTesterThread::run() {
--  while(1) {
-+  while(!m_stop) {
- 	  msleep( m_parent.m_msecs / 10 );
- 	  m_parent.m_timeMutex.lock();
- 	  QDateTime t = QDateTime::currentDateTime();
-@@ -3146,7 +3146,11 @@
- 	  m_parent.m_timeMutex.unlock();
-   }
- }
--      
-+
-+void UIBlockTester::UIBlockTesterThread::stop() {
-+	m_stop = true;
-+}
-+
- UIBlockTester::UIBlockTester( uint milliseconds ) : m_thread( *this ), m_msecs( milliseconds ) {
- 	m_timer = new QTimer( this );
- 	m_timer->start( milliseconds/10 );
-@@ -3155,7 +3159,7 @@
- 	m_thread.start();
- }
- UIBlockTester::~UIBlockTester() {
--  m_thread.terminate();
-+  m_thread.stop();
-   m_thread.wait();
- }
- 	
-diff -u -u kdevelop-3.4.1/languages/cpp/cppsupportpart.h kdevelop-svn/languages/cpp/cppsupportpart.h
---- kdevelop-3.4.1/languages/cpp/cppsupportpart.h	2007-05-16 16:36:20.000000000 +0200
-+++ kdevelop-svn/languages/cpp/cppsupportpart.h	2007-05-16 00:25:57.000000000 +0200
-@@ -43,9 +43,10 @@
-     public:
-       UIBlockTesterThread( UIBlockTester& parent );
-       void run();
--      
-+      void stop();
-     private:
-       UIBlockTester& m_parent;
-+      bool m_stop;
-     };
-   friend class UIBlockTesterThread;
- public:

Deleted: post-3.5.9.patch
===================================================================
--- post-3.5.9.patch	2008-06-22 19:46:55 UTC (rev 3462)
+++ post-3.5.9.patch	2008-06-22 19:48:42 UTC (rev 3463)
@@ -1,49 +0,0 @@
-Index: parts/outputviews/makewidget.cpp
-===================================================================
---- parts/outputviews/makewidget.cpp	(Revision 780035)
-+++ parts/outputviews/makewidget.cpp	(Revision 780036)
-@@ -532,28 +532,31 @@
- {
-     QString sline;
-     bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true );
-+    
-     if( forceCLocale )
-         sline = QString::fromAscii( stdoutbuf+line );
-     else
-         sline = QString::fromLocal8Bit( stdoutbuf+line );
--    stdoutbuf.truncate(0);
- 
-     if ( !appendToLastLine( sline ) )
-         m_directoryStatusFilter.processLine( sline );
-+    stdoutbuf.truncate(0);
- }
- 
- void MakeWidget::insertStderrLine( const QCString& line )
- {
-     QString sline;
-     bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true );
-+    
-     if( forceCLocale ) {
-         sline = QString( stderrbuf+line );
-     }
-     else
-         sline = QString::fromLocal8Bit( stderrbuf+line );
-+    
-+    if ( !appendToLastLine( sline ) )
-+        m_errorFilter.processLine( sline );
-     stderrbuf.truncate(0);
--    if ( !appendToLastLine( line ) )
--        m_errorFilter.processLine( line );
- }
- 
- void MakeWidget::slotProcessExited(KProcess *)
-@@ -832,7 +835,7 @@
- 
- void MakeWidget::storePartialStdoutLine(const QCString & line)
- {
--    stderrbuf += line;
-+    stdoutbuf += line;
- }
- 
- #include "makewidget.moc"
-