From 5661d90024acd6f43dc38211891c7b48cd0709f2 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Nov 2011 15:51:40 -0600
Subject: Fix configdialog FTBFS

---
 configdialog/CMakeLists.txt           |  3 ++-
 configdialog/kbfxconfigdlgmain.ui     | 16 ++++++++--------
 configdialog/kbfxconfigdlgthemes.ui   |  2 +-
 configdialog/kbfxconfigdlgthemes.ui.h |  2 +-
 configdialog/kbfxconfigdlgtooltip.ui  |  4 ++--
 5 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'configdialog')

diff --git a/configdialog/CMakeLists.txt b/configdialog/CMakeLists.txt
index aac563b..20ff4cc 100644
--- a/configdialog/CMakeLists.txt
+++ b/configdialog/CMakeLists.txt
@@ -15,6 +15,7 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/kbfxlib/common
   ${CMAKE_SOURCE_DIR}/kbfxlib/data
+  ${CMAKE_SOURCE_DIR}/src
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
@@ -28,7 +29,7 @@ link_directories(
 
 ##### kbfxconfigapp (executable) ################
 
-tde_add_executable( kbfxconfigapp
+tde_add_executable( kbfxconfigapp AUTOMOC
   SOURCES main.cpp kbfxconfigapp.cpp kbfxthemeinfo.ui
           kbfxconfigdlgbutton.ui kbfxconfigdlgmain.ui
           kbfxconfigdlgthemes.ui kbfxconfigdlgabout.ui
diff --git a/configdialog/kbfxconfigdlgmain.ui b/configdialog/kbfxconfigdlgmain.ui
index 96d30f5..d87e019 100644
--- a/configdialog/kbfxconfigdlgmain.ui
+++ b/configdialog/kbfxconfigdlgmain.ui
@@ -648,14 +648,14 @@
     <include location="local" impldecl="in implementation">kbfxconfigdlgmain.ui.h</include>
 </includes>
 <variables>
-    <variable access="public">QPixmap img_button;</variable>
-    <variable access="public">QPixmap img_themes;</variable>
-    <variable access="public">QPixmap img_fonts;</variable>
-    <variable access="public">QPixmap img_style;</variable>
-    <variable access="public">QPixmap img_tooltip;</variable>
-    <variable access="public">QPixmap img_search;</variable>
-    <variable access="public">QPixmap img_plugins;</variable>
-    <variable access="public">QPixmap img_about;</variable>
+    <variable access="public">TQPixmap img_button;</variable>
+    <variable access="public">TQPixmap img_themes;</variable>
+    <variable access="public">TQPixmap img_fonts;</variable>
+    <variable access="public">TQPixmap img_style;</variable>
+    <variable access="public">TQPixmap img_tooltip;</variable>
+    <variable access="public">TQPixmap img_search;</variable>
+    <variable access="public">TQPixmap img_plugins;</variable>
+    <variable access="public">TQPixmap img_about;</variable>
 </variables>
 <Q_SIGNALS>
     <signal>KbfxConfigDlgButtonChanged(const char * name, const QString &amp; path)</signal>
diff --git a/configdialog/kbfxconfigdlgthemes.ui b/configdialog/kbfxconfigdlgthemes.ui
index 1d37a64..9e1a646 100644
--- a/configdialog/kbfxconfigdlgthemes.ui
+++ b/configdialog/kbfxconfigdlgthemes.ui
@@ -998,7 +998,7 @@
     <variable access="private">bool KbfxFormReady;</variable>
     <variable access="private">TQString KbfxInstallDialogURL;</variable>
     <variable access="public">TQStringList KbfxThemes;</variable>
-    <variable access="public">QPixmap img_nopreview;</variable>
+    <variable access="public">TQPixmap img_nopreview;</variable>
     <variable>static KbfxThemeInfo * _info_box;</variable>
 </variables>
 <Q_SIGNALS>
diff --git a/configdialog/kbfxconfigdlgthemes.ui.h b/configdialog/kbfxconfigdlgthemes.ui.h
index fb5d722..3c6ec3b 100644
--- a/configdialog/kbfxconfigdlgthemes.ui.h
+++ b/configdialog/kbfxconfigdlgthemes.ui.h
@@ -315,7 +315,7 @@ void KbfxConfigDlgThemes::KbfxThemeInfoClicked()
 	TQPixmap _logo = TQPixmap (ConfigInit ().m_SpinxThemeBasePath + ConfigInit ().m_SpinxThemeName + "/logo.png");
 
 	ConfigInit().readThemeInfo ( ConfigInit().m_SpinxThemeBasePath, ConfigInit().m_SpinxThemeName );
-	_info_box = new KbfxThemeInfo (this,"infodlg",TQt::WType_Modal);
+	_info_box = new KbfxThemeInfo (this,"infodlg",(WType_Dialog|WShowModal));
 
 	if ( !_logo.isNull() )
 	{
diff --git a/configdialog/kbfxconfigdlgtooltip.ui b/configdialog/kbfxconfigdlgtooltip.ui
index d5005ae..98215d6 100644
--- a/configdialog/kbfxconfigdlgtooltip.ui
+++ b/configdialog/kbfxconfigdlgtooltip.ui
@@ -694,8 +694,8 @@
     <include location="local" impldecl="in implementation">kbfxconfigdlgtooltip.ui.h</include>
 </includes>
 <variables>
-    <variable access="public">QPixmap img_on;</variable>
-    <variable access="public">QPixmap img_off;</variable>
+    <variable access="public">TQPixmap img_on;</variable>
+    <variable access="public">TQPixmap img_off;</variable>
 </variables>
 <Q_SLOTS>
     <slot>KbfxTooltipAnimationButtonToggled( bool )</slot>
-- 
cgit v1.2.1