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

List:       kde-commits
Subject:    KDE/kdevelop/plugins
From:       Andreas Pakulat <apaku () gmx ! de>
Date:       2008-12-29 18:51:57
Message-ID: 1230576717.116017.28856.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 903029 by apaku:

Adapt to the IStatus changes in kdevplatform, provide the IStatus
instance together with the signal.
This also fixes a bug, gdbcontroller was indirectly emitting the
showMessage for IStatus, but gdbcontroller isn't an IStatus so the slot
in shell failed to do its work.

 M  +11 -6     cppdebugger/debuggerplugin.cpp  
 M  +6 -4      cppdebugger/debuggerplugin.h  
 M  +4 -4      xtest/qtest/kdevregister.cpp  
 M  +5 -5      xtest/qtest/kdevregister.h  


--- trunk/KDE/kdevelop/plugins/cppdebugger/debuggerplugin.cpp #903028:903029
@@ -499,7 +499,7 @@
     connect( controller, SIGNAL(stateChanged(DBGStateFlags, DBGStateFlags)),
              this,       SLOT(slotStateChanged(DBGStateFlags, DBGStateFlags)));
 
-    connect(controller, SIGNAL(showMessage(const QString&, int)), this, \
SIGNAL(showMessage(const QString&, int))); +    connect(controller, \
SIGNAL(showMessage(const QString&, int)), this, SLOT(controllerMessage(const \
QString&, int)));  
     // controller -> procLineMaker
     connect( controller,            SIGNAL(ttyStdout(const QByteArray&)),
@@ -554,13 +554,13 @@
 
 void CppDebuggerPlugin::slotExamineCore()
 {
-    emit showMessage(i18n("Choose a core file to examine..."), 1000);
+    emit showMessage(this, i18n("Choose a core file to examine..."), 1000);
 
     KUrl coreFile = KFileDialog::getOpenUrl(QDir::homePath());
     if (!coreFile.isValid())
         return;
 
-    emit showMessage(i18n("Examining core file %1", coreFile.url()), 1000);
+    emit showMessage(this, i18n("Examining core file %1", coreFile.url()), 1000);
 
     controller->examineCoreFile(coreFile);
 }
@@ -568,7 +568,7 @@
 
 void CppDebuggerPlugin::slotAttachProcess()
 {
-    emit showMessage(i18n("Choose a process to attach to..."), 1000);
+    emit showMessage(this, i18n("Choose a process to attach to..."), 1000);
 
     ProcessSelectionDialog dlg;
     if (!dlg.exec() || !dlg.pidSelected())
@@ -580,7 +580,7 @@
 
 void CppDebuggerPlugin::attachProcess(int pid)
 {
-    emit showMessage(i18n("Attaching to process %1", pid), 1000);
+    emit showMessage(this, i18n("Attaching to process %1", pid), 1000);
 
     controller->attachToProcess(pid);
 }
@@ -782,7 +782,7 @@
     kDebug(9012) << "   " << message;
 
     if (!message.isEmpty())
-        emit showMessage(message, 3000);
+        emit showMessage(this, message, 3000);
 }
 
 void CppDebuggerPlugin::demandAttention() const
@@ -805,6 +805,11 @@
         emit output(controller->job(), line, KDevelop::IRunProvider::StandardError);
 }
 
+void CppDebuggerPlugin::controllerMessage( const QString& msg, int timeout )
+{
+    emit showMessage(this, msg, timeout);
 }
 
+}
+
 #include "debuggerplugin.moc"
--- trunk/KDE/kdevelop/plugins/cppdebugger/debuggerplugin.h #903028:903029
@@ -101,10 +101,10 @@
     virtual QString statusName() const;
 
 Q_SIGNALS:
-    void clearMessage();
-    void showMessage(const QString & message, int timeout = 0);
-    void hideProgress();
-    void showProgress(int minimum, int maximum, int value);
+    void clearMessage(KDevelop::IStatus*);
+    void showMessage(KDevelop::IStatus*, const QString & message, int timeout = 0);
+    void hideProgress(KDevelop::IStatus*);
+    void showProgress(KDevelop::IStatus*, int minimum, int maximum, int value);
     //END IStatus
 
     void raiseOutputViews();
@@ -149,6 +149,8 @@
     void applicationStandardOutputLines(const QStringList& lines);
     void applicationStandardErrorLines(const QStringList& lines);
 
+    void controllerMessage(const QString&, int);
+
 Q_SIGNALS:
     void startDebugger(const KDevelop::IRun & run, KJob* job);
     void stopDebugger();
--- trunk/KDE/kdevelop/plugins/xtest/qtest/kdevregister.cpp #903028:903029
@@ -100,7 +100,7 @@
     m_reloading = false; \
     emit reloadFailed(); \
     kDebug() << MSG; \
-    emit showErrorMessage(MSG, 5); \
+    emit showError(MSG, 5); \
     return KUrl(); \
 } else void(0)
 
@@ -131,12 +131,12 @@
         KConfigGroup veriConf = project()->projectConfiguration()->group( "Veritas" \
);  if (!veriConf.exists()) {
             emit reloadFailed();
-            emit showErrorMessage(i18n("Failed to load test suite. No test \
executables configured."), 5); +            emit showError(i18n("Failed to load test \
suite. No test executables configured."), 5);  return;
         }
         if (veriConf.readEntry( "framework" ) != "QTest") {
             emit reloadFailed();
-            emit showErrorMessage(i18n("Failed to load test suite. Wrong \
framework."), 5); +            emit showError(i18n("Failed to load test suite. Wrong \
framework."), 5);  return;            
         }
         QStringList exes = veriConf.readEntry<QStringList>( "executables", \
QStringList() ); @@ -152,7 +152,7 @@
         }
         if (m_testExes.isEmpty()) {
             emit reloadFailed();
-            emit showErrorMessage(i18n("Failed to load test suite. No test \
executables configured."), 5); +            emit showError(i18n("Failed to load test \
suite. No test executables configured."), 5);  return;            
         }
     }
--- trunk/KDE/kdevelop/plugins/xtest/qtest/kdevregister.h #903028:903029
@@ -55,11 +55,11 @@
     virtual QString statusName() const;
 
 Q_SIGNALS:
-    void clearMessage();
-    void showMessage(const QString&, int timeout=0);
-    void hideProgress();
-    void showProgress(int minimum, int maximum, int value);
-    void showErrorMessage(QString, int timeout);
+    void clearMessage(KDevelop::IStatus*);
+    void showMessage(KDevelop::IStatus*, const QString&, int timeout=0);
+    void hideProgress(KDevelop::IStatus*);
+    void showProgress(KDevelop::IStatus*, int minimum, int maximum, int value);
+    void showError(QString, int timeout);
 // IStatus
 
 private slots:


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