From a5876fca10f57c14b28c2be5fe8cd6b49b9bf279 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Nov 2011 15:02:15 -0600 Subject: [PATCH] Fix FTBFS (cherry picked from commit 96f2a488786e370c355778e00c795e776e09d199) --- konversation/src/alias_preferences.h | 2 ++ konversation/src/autoreplace_preferences.h | 2 ++ konversation/src/config/konversation.kcfg | 2 +- konversation/src/highlight_preferences.h | 2 +- konversation/src/ignore_preferences.h | 2 +- konversation/src/quickbuttons_preferences.h | 2 ++ 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/konversation/src/alias_preferences.h b/konversation/src/alias_preferences.h index cf70b4f..aeb3062 100644 --- a/konversation/src/alias_preferences.h +++ b/konversation/src/alias_preferences.h @@ -13,6 +13,8 @@ #ifndef EXALIASPREFERENCES_H #define EXALIASPREFERENCES_H +#include + #include "alias_preferencesui.h" #include "konvisettingspage.h" diff --git a/konversation/src/autoreplace_preferences.h b/konversation/src/autoreplace_preferences.h index c73da29..9cab1f0 100644 --- a/konversation/src/autoreplace_preferences.h +++ b/konversation/src/autoreplace_preferences.h @@ -13,6 +13,8 @@ #ifndef AUTOREPLACECONFIG_H #define AUTOREPLACECONFIG_H +#include + #include "autoreplace_preferencesui.h" #include "konvisettingspage.h" diff --git a/konversation/src/config/konversation.kcfg b/konversation/src/config/konversation.kcfg index a2a2582..8cf2b82 100644 --- a/konversation/src/config/konversation.kcfg +++ b/konversation/src/config/konversation.kcfg @@ -294,7 +294,7 @@ - QSize(400, 200) + TQSize(400, 200) diff --git a/konversation/src/highlight_preferences.h b/konversation/src/highlight_preferences.h index 67863a7..89974ca 100644 --- a/konversation/src/highlight_preferences.h +++ b/konversation/src/highlight_preferences.h @@ -17,7 +17,7 @@ #include "konvisettingspage.h" #include - +#include class Highlight_Config; class Highlight; diff --git a/konversation/src/ignore_preferences.h b/konversation/src/ignore_preferences.h index e910b78..a19ff03 100644 --- a/konversation/src/ignore_preferences.h +++ b/konversation/src/ignore_preferences.h @@ -17,7 +17,7 @@ #include "konvisettingspage.h" #include - +#include class Ignore; class Ignore_Config : public Ignore_ConfigUI, public KonviSettingsPage diff --git a/konversation/src/quickbuttons_preferences.h b/konversation/src/quickbuttons_preferences.h index c8cc0e1..ccf26af 100644 --- a/konversation/src/quickbuttons_preferences.h +++ b/konversation/src/quickbuttons_preferences.h @@ -13,6 +13,8 @@ #ifndef TQUICKBUTTONSCONFIG_H #define TQUICKBUTTONSCONFIG_H +#include + #include "quickbuttons_preferencesui.h" #include "konvisettingspage.h"