diff --git a/configdialog/CMakeLists.txt b/configdialog/CMakeLists.txt
index a64b25a..6be458b 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 @@
kbfxconfigdlgmain.ui.h
- QPixmap img_button;
- QPixmap img_themes;
- QPixmap img_fonts;
- QPixmap img_style;
- QPixmap img_tooltip;
- QPixmap img_search;
- QPixmap img_plugins;
- QPixmap img_about;
+ TQPixmap img_button;
+ TQPixmap img_themes;
+ TQPixmap img_fonts;
+ TQPixmap img_style;
+ TQPixmap img_tooltip;
+ TQPixmap img_search;
+ TQPixmap img_plugins;
+ TQPixmap img_about;
KbfxConfigDlgButtonChanged(const char * name, const QString & path)
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 @@
bool KbfxFormReady;
TQString KbfxInstallDialogURL;
TQStringList KbfxThemes;
- QPixmap img_nopreview;
+ TQPixmap img_nopreview;
static KbfxThemeInfo * _info_box;
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 @@
kbfxconfigdlgtooltip.ui.h
- QPixmap img_on;
- QPixmap img_off;
+ TQPixmap img_on;
+ TQPixmap img_off;
KbfxTooltipAnimationButtonToggled( bool )
diff --git a/plugins/applications/CMakeLists.txt b/plugins/applications/CMakeLists.txt
index 6a717fd..9948802 100644
--- a/plugins/applications/CMakeLists.txt
+++ b/plugins/applications/CMakeLists.txt
@@ -1,44 +1,44 @@
-SET(libkbfxplasmadatastubsrc
- kbfxplasmadataplugin.cpp
- )
-
-FILE(GLOB HEADERS *.h)
-
-IF (NOT USE_KDE4)
- KDE3_AUTOMOC(${libkbfxplasmadatastubsrc})
-
- ADD_LIBRARY(kbfxplasmadatastub SHARED ${libkbfxplasmadatastubsrc})
- SET_TARGET_PROPERTIES(kbfxplasmadatastub
- PROPERTIES
- COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
- # SET_TARGET_PROPERTIES(kbfxplasmadatastub PROPERTIES
- # SOVERSION ${LIB_MAJOR}
- # VERSION ${APPLICATION_VERSION})
- TARGET_LINK_LIBRARIES(kbfxplasmadatastub
- kbfxdata
- ${QT_AND_KDECORE_LIBS}
- ${KDE3_KIO_LIBRARY}
- ${KDE3_UI_LIBRARY}
- ${KDE3_KHTML_LIBRARY}
- ${M_LIBRARY}
- )
-
- KDE3_INSTALL_LIBTOOL_FILE(kbfxplasmadatastub ${LIB_INSTALL_DIR}/kbfx/plugins)
-ELSE (NOT USE_KDE4)
- KDE4_AUTOMOC(${libkbfxplasmadatastubsrc})
-
- KDE4_ADD_LIBRARY(kbfxplasmadatastub SHARED ${libkbfxplasmadatastubsrc})
- TARGET_LINK_LIBRARIES(kbfxplasmadatastub
- kbfxdata
- ${KDE4_KDECORE_LIBS}
- ${KDE4_KIO_LIBS}
- ${KDE4_KDEUI_LIBS}
- ${KDE4_KHTML_LIBS}
- ${M_LIBRARY}
- )
-
- KDE4_INSTALL_LIBTOOL_FILE(kbfxplasmadatastub ${LIB_INSTALL_DIR}/kbfx/plugins)
-ENDIF (NOT USE_KDE4)
-
-INSTALL(TARGETS kbfxplasmadatastub DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins)
+#################################################
+#
+# (C) 2011 Timothy Pearson
+# kb9vqf (AT) pearsoncomputing.net
+#
+# Improvements and feedback are welcome
+#
+# This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+ ${TQT_INCLUDE_DIRS}
+ ${TDE_INCLUDE_DIR}
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+)
+
+
+##### kbfxplasmadatastub #########################
+
+set( target kbfxplasmadatastub )
+
+set( ${target}_SRCS
+ kbfxplasmadataplugin.cpp
+)
+
+tde_add_library( ${target} SHARED AUTOMOC
+ SOURCES ${${target}_SRCS}
+# VERSION 4.2.0
+ LINK DCOP-shared kdecore-shared kdeui-shared kio-shared khtml-shared ${M_LIBRARY} kbfxdata
+ DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins
+)
+
+
+##### headers #######################################
+
+file( GLOB HEADERS *.h )
INSTALL(FILES ${HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kbfx/plugins)