summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-18 13:26:52 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-06-04 04:35:52 +0200
commit065740ce504254d6d4e5251face9401712ad4fb9 (patch)
tree25a755c9965309d8a34a63bf3e1a8934635ecfc1
parentc795cf96f34f01bdb01158fa4c04d64f6ee40c38 (diff)
downloadtdeedu-065740ce504254d6d4e5251face9401712ad4fb9.tar.gz
tdeedu-065740ce504254d6d4e5251face9401712ad4fb9.zip
Fix FTBFS
(cherry picked from commit 6d932d40aa22bdf60f00ada0f16a1a21b9b4c1f6)
-rw-r--r--kig/modes/typesdialog.cpp2
-rw-r--r--kig/modes/typesdialogbase.ui6
-rw-r--r--klettres/klettres/klettres.kcfg2
-rw-r--r--kstars/kstars/kstars.kcfg6
-rw-r--r--ktouch/src/ktouch.kcfg2
-rw-r--r--kwordquiz/src/prefcardappearancebase.ui30
6 files changed, 25 insertions, 23 deletions
diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp
index 97973857..df061888 100644
--- a/kig/modes/typesdialog.cpp
+++ b/kig/modes/typesdialog.cpp
@@ -18,6 +18,8 @@
USA
**/
+#include "tqlistview.h"
+
#include "typesdialog.h"
#include "typesdialog.moc"
diff --git a/kig/modes/typesdialogbase.ui b/kig/modes/typesdialogbase.ui
index 8da4d05a..6e6e4eee 100644
--- a/kig/modes/typesdialogbase.ui
+++ b/kig/modes/typesdialogbase.ui
@@ -302,9 +302,9 @@
</connection>
<connection>
<sender>typeList</sender>
- <signal>contextMenuRequested(TQListViewItem*,const QPoint&amp;,int)</signal>
+ <signal>contextMenuRequested(TQListViewItem*,const TQPoint&amp;,int)</signal>
<receiver>TypesDialogBase</receiver>
- <slot>contextMenuRequested(TQListViewItem*,const QPoint&amp;,int)</slot>
+ <slot>contextMenuRequested(TQListViewItem*,const TQPoint&amp;,int)</slot>
</connection>
<connection>
<sender>buttonCancel</sender>
@@ -320,7 +320,7 @@
<slot access="protected">importTypes()</slot>
<slot>okSlot()</slot>
<slot access="protected">editType()</slot>
- <slot access="protected">contextMenuRequested( TQListViewItem* i, const QPoint&amp; p, int c )</slot>
+ <slot access="protected">contextMenuRequested( TQListViewItem* i, const TQPoint&amp; p, int c )</slot>
<slot>cancelSlot()</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
diff --git a/klettres/klettres/klettres.kcfg b/klettres/klettres/klettres.kcfg
index 4769b359..b79d220f 100644
--- a/klettres/klettres/klettres.kcfg
+++ b/klettres/klettres/klettres.kcfg
@@ -43,7 +43,7 @@
<group name="mFont">
<entry name="Font" type="Font" key="mFont">
<label>Font</label>
- <code>QFont defaultFont = KGlobalSettings::largeFont();
+ <code>TQFont defaultFont = KGlobalSettings::largeFont();
defaultFont.setPointSize(48);
defaultFont.setBold(true);
</code>
diff --git a/kstars/kstars/kstars.kcfg b/kstars/kstars/kstars.kcfg
index 77ebdad7..cca486dd 100644
--- a/kstars/kstars/kstars.kcfg
+++ b/kstars/kstars/kstars.kcfg
@@ -9,17 +9,17 @@
<entry name="PositionTimeBox" type="Point">
<label>Position of the time InfoBox.</label>
<whatsthis>The screen coordinates of the Time InfoBox.</whatsthis>
- <default code="true">QPoint(0,0)</default>
+ <default code="true">TQPoint(0,0)</default>
</entry>
<entry name="PositionFocusBox" type="Point">
<label>Position of the focus InfoBox.</label>
<whatsthis>The screen coordinates of the Focus InfoBox.</whatsthis>
- <default code="true">QPoint(600,0)</default>
+ <default code="true">TQPoint(600,0)</default>
</entry>
<entry name="PositionGeoBox" type="Point">
<label>Position of the geographic InfoBox.</label>
<whatsthis>The screen coordinates of the Geographic Location InfoBox.</whatsthis>
- <default code="true">QPoint(0,600)</default>
+ <default code="true">TQPoint(0,600)</default>
</entry>
<entry name="ShadeTimeBox" type="Bool">
<label>Is the time InfoBox in the "shaded" state?</label>
diff --git a/ktouch/src/ktouch.kcfg b/ktouch/src/ktouch.kcfg
index bf465639..829bf6fb 100644
--- a/ktouch/src/ktouch.kcfg
+++ b/ktouch/src/ktouch.kcfg
@@ -65,7 +65,7 @@
</entry>
<entry type="Font" name="Font" >
<label >The font for the student and teacher lines</label>
- <default code="true">QFont(&quot;Monospace&quot;)</default>
+ <default code="true">TQFont(&quot;Monospace&quot;)</default>
</entry>
<entry type="Path" name="CurrentLectureFile" >
<label >The currently loaded lecture file</label>
diff --git a/kwordquiz/src/prefcardappearancebase.ui b/kwordquiz/src/prefcardappearancebase.ui
index f1ac84d8..3ac9e381 100644
--- a/kwordquiz/src/prefcardappearancebase.ui
+++ b/kwordquiz/src/prefcardappearancebase.ui
@@ -498,33 +498,33 @@
</connection>
<connection>
<sender>kcfg_FrontFont</sender>
- <signal>fontSelected(const QFont&amp;)</signal>
+ <signal>fontSelected(const TQFont&amp;)</signal>
<receiver>PrefCardAppearanceBase</receiver>
- <slot>slotFontChanged(const QFont&amp;)</slot>
+ <slot>slotFontChanged(const TQFont&amp;)</slot>
</connection>
<connection>
<sender>kcfg_FrontTextColor</sender>
- <signal>changed(const QColor&amp;)</signal>
+ <signal>changed(const TQColor&amp;)</signal>
<receiver>PrefCardAppearanceBase</receiver>
- <slot>slotTextColorChanged(const QColor&amp;)</slot>
+ <slot>slotTextColorChanged(const TQColor&amp;)</slot>
</connection>
<connection>
<sender>kcfg_FrontCardColor</sender>
- <signal>changed(const QColor&amp;)</signal>
+ <signal>changed(const TQColor&amp;)</signal>
<receiver>PrefCardAppearanceBase</receiver>
- <slot>slotCardColorChanged(const QColor&amp;)</slot>
+ <slot>slotCardColorChanged(const TQColor&amp;)</slot>
</connection>
<connection>
<sender>kcfg_FrontFrameColor</sender>
- <signal>changed(const QColor&amp;)</signal>
+ <signal>changed(const TQColor&amp;)</signal>
<receiver>PrefCardAppearanceBase</receiver>
- <slot>slotFrameColorChanged(const QColor&amp;)</slot>
+ <slot>slotFrameColorChanged(const TQColor&amp;)</slot>
</connection>
<connection>
<sender>widgetStack</sender>
- <signal>aboutToShow(QWidget*)</signal>
+ <signal>aboutToShow(TQWidget*)</signal>
<receiver>PrefCardAppearanceBase</receiver>
- <slot>slotAboutToShowWidget(QWidget*)</slot>
+ <slot>slotAboutToShowWidget(TQWidget*)</slot>
</connection>
</connections>
<tabstops>
@@ -536,11 +536,11 @@
</tabstops>
<Q_SLOTS>
<slot>slotFlipButtonClicked()</slot>
- <slot>slotFontChanged(const QFont &amp;)</slot>
- <slot>slotTextColorChanged(const QColor &amp;)</slot>
- <slot>slotAboutToShowWidget(QWidget *)</slot>
- <slot>slotFrameColorChanged(const QColor &amp;)</slot>
- <slot>slotCardColorChanged(const QColor &amp;)</slot>
+ <slot>slotFontChanged(const TQFont &amp;)</slot>
+ <slot>slotTextColorChanged(const TQColor &amp;)</slot>
+ <slot>slotAboutToShowWidget(TQWidget *)</slot>
+ <slot>slotFrameColorChanged(const TQColor &amp;)</slot>
+ <slot>slotCardColorChanged(const TQColor &amp;)</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
<includehints>