Nathan Scott wrote:
> On Wed, 2007-10-17 at 01:44 +0200, Olivier Tarnus wrote:
>
>>
>>
>> Hey...
>>
>> Had some time to spend tonight :-)
>>
>> So i fixed calls to use triggered(), and also made some fix for
>> InfoDialog::infoTabCurrentChanged(QWidget*) and
>> KmChart::activeTabChanged(QWidget*) as they had also some problems
>> because of the change of QTabWidget::currentChanged to int.
>>
>> Everything now runs fine... Happy to have fixed it myself ;-)
>>
>>
>
> Great! I've just merged the triggered() fix, could you send
> me a patch for everything else you needed to change? Thanks.
>
> cheers.
>
> --
> Nathan
>
>
Sorry, forgot to attach the patch...
here it is..
Olivier
diff --git a/src/chart/infodialog.cpp b/src/chart/infodialog.cpp
index bab455c..af01dd4 100644
--- a/src/chart/infodialog.cpp
+++ b/src/chart/infodialog.cpp
@@ -40,7 +40,7 @@ void InfoDialog::reset(QString source, QString metric,
QString instance,
my.instance = instance;
infoTab->setCurrentWidget(pminfoTab);
- infoTabCurrentChanged(pminfoTab);
+ infoTabCurrentChanged(0);
}
void InfoDialog::pminfo(void)
@@ -130,15 +130,15 @@ void InfoDialog::pmvalStderr()
pmvalTextEdit->append(s);
}
-void InfoDialog::infoTabCurrentChanged(QWidget *current)
+void InfoDialog::infoTabCurrentChanged(int)
{
- if (current == pminfoTab) {
+ if (infoTab->currentWidget() == pminfoTab) {
if (!my.pminfoStarted) {
pminfo();
my.pminfoStarted = true;
}
}
- else if (current == pmvalTab) {
+ else if (infoTab->currentWidget() == pmvalTab) {
if (!my.pmvalStarted) {
pmval();
my.pmvalStarted = true;
diff --git a/src/chart/infodialog.h b/src/chart/infodialog.h
index cc2d5c6..ab8a714 100644
--- a/src/chart/infodialog.h
+++ b/src/chart/infodialog.h
@@ -32,7 +32,7 @@ public slots:
virtual void pminfoStderr();
virtual void pmvalStdout();
virtual void pmvalStderr();
- virtual void infoTabCurrentChanged(QWidget *);
+ virtual void infoTabCurrentChanged(int);
virtual void quit();
protected slots:
diff --git a/src/chart/infodialog.ui b/src/chart/infodialog.ui
index 3552b0e..ce5ec77 100644
--- a/src/chart/infodialog.ui
+++ b/src/chart/infodialog.ui
@@ -174,9 +174,9 @@
</connection>
<connection>
<sender>infoTab</sender>
- <signal>currentChanged(QWidget*)</signal>
+ <signal>currentChanged(int)</signal>
<receiver>InfoDialog</receiver>
- <slot>infoTabCurrentChanged(QWidget*)</slot>
+ <slot>infoTabCurrentChanged(int)</slot>
</connection>
</connections>
</ui>
diff --git a/src/chart/kmchart.cpp b/src/chart/kmchart.cpp
index 337107e..4e2e50e 100644
--- a/src/chart/kmchart.cpp
+++ b/src/chart/kmchart.cpp
@@ -649,9 +649,8 @@ void KmChart::setActiveTab(int index, bool redisplay)
chartTab->setCurrentIndex(index);
}
-void KmChart::activeTabChanged(QWidget *)
+void KmChart::activeTabChanged(int index)
{
- int index = chartTab->currentIndex();
if (index < tabs.size())
setActiveTab(index, false);
diff --git a/src/chart/kmchart.h b/src/chart/kmchart.h
index 5f57ace..14daef0 100644
--- a/src/chart/kmchart.h
+++ b/src/chart/kmchart.h
@@ -112,7 +112,7 @@ public slots:
virtual void acceptExport();
virtual void addTab();
virtual void closeTab();
- virtual void activeTabChanged(QWidget *);
+ virtual void activeTabChanged(int);
virtual void editSettings();
virtual void acceptSettings();
virtual void recordStart();
diff --git a/src/chart/kmchart.ui b/src/chart/kmchart.ui
index f3e2850..0c4ad45 100644
--- a/src/chart/kmchart.ui
+++ b/src/chart/kmchart.ui
@@ -638,7 +638,7 @@
<connections>
<connection>
<sender>fileNewChartAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>fileNewChart()</slot>
<hints>
@@ -654,7 +654,7 @@
</connection>
<connection>
<sender>fileOpenViewAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>fileOpenView()</slot>
<hints>
@@ -670,7 +670,7 @@
</connection>
<connection>
<sender>fileSaveViewAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>fileSaveView()</slot>
<hints>
@@ -686,7 +686,7 @@
</connection>
<connection>
<sender>fileExportAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>fileExport()</slot>
<hints>
@@ -702,7 +702,7 @@
</connection>
<connection>
<sender>filePrintAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>filePrint()</slot>
<hints>
@@ -718,7 +718,7 @@
</connection>
<connection>
<sender>fileQuitAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>fileQuit()</slot>
<hints>
@@ -734,7 +734,7 @@
</connection>
<connection>
<sender>helpTutorialAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>helpTutorial()</slot>
<hints>
@@ -750,7 +750,7 @@
</connection>
<connection>
<sender>helpAboutAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>helpAbout()</slot>
<hints>
@@ -766,7 +766,7 @@
</connection>
<connection>
<sender>helpSeeAlsoAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>helpSeeAlso()</slot>
<hints>
@@ -782,7 +782,7 @@
</connection>
<connection>
<sender>helpWhatsThisAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>whatsThis()</slot>
<hints>
@@ -798,7 +798,7 @@
</connection>
<connection>
<sender>timeControlAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>optionsTimeControl()</slot>
<hints>
@@ -814,7 +814,7 @@
</connection>
<connection>
<sender>toolbarAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>optionsToolbar()</slot>
<hints>
@@ -830,7 +830,7 @@
</connection>
<connection>
<sender>consoleAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>optionsConsole()</slot>
<hints>
@@ -846,7 +846,7 @@
</connection>
<connection>
<sender>newKmchartAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>optionsNewKmchart()</slot>
<hints>
@@ -862,7 +862,7 @@
</connection>
<connection>
<sender>closeTabAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>closeTab()</slot>
<hints>
@@ -878,7 +878,7 @@
</connection>
<connection>
<sender>editSettingsAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>editSettings()</slot>
<hints>
@@ -894,9 +894,9 @@
</connection>
<connection>
<sender>chartTab</sender>
- <signal>currentChanged(QWidget*)</signal>
+ <signal>currentChanged(int)</signal>
<receiver>KmChart</receiver>
- <slot>activeTabChanged(QWidget*)</slot>
+ <slot>activeTabChanged(int)</slot>
<hints>
<hint type="sourcelabel" >
<x>20</x>
@@ -926,7 +926,7 @@
</connection>
<connection>
<sender>editChartAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>editChart()</slot>
<hints>
@@ -942,7 +942,7 @@
</connection>
<connection>
<sender>closeChartAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>closeChart()</slot>
<hints>
@@ -958,7 +958,7 @@
</connection>
<connection>
<sender>editTabAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>editTab()</slot>
<hints>
@@ -974,7 +974,7 @@
</connection>
<connection>
<sender>closeTabAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>closeTab()</slot>
<hints>
@@ -990,7 +990,7 @@
</connection>
<connection>
<sender>addTabAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>addTab()</slot>
<hints>
@@ -1006,7 +1006,7 @@
</connection>
<connection>
<sender>helpManualAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>helpManual()</slot>
<hints>
@@ -1022,7 +1022,7 @@
</connection>
<connection>
<sender>recordStartAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>recordStart()</slot>
<hints>
@@ -1038,7 +1038,7 @@
</connection>
<connection>
<sender>recordQueryAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>recordQuery()</slot>
<hints>
@@ -1054,7 +1054,7 @@
</connection>
<connection>
<sender>recordStopAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>recordStop()</slot>
<hints>
@@ -1070,7 +1070,7 @@
</connection>
<connection>
<sender>recordDetachAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>recordDetach()</slot>
<hints>
@@ -1086,7 +1086,7 @@
</connection>
<connection>
<sender>zoomInAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>zoomIn()</slot>
<hints>
@@ -1102,7 +1102,7 @@
</connection>
<connection>
<sender>zoomOutAction</sender>
- <signal>activated()</signal>
+ <signal>triggered()</signal>
<receiver>KmChart</receiver>
<slot>zoomOut()</slot>
<hints>
|