9 files changed, 20 insertions, 15 deletions
diff --git a/quanta/dialogs/settings/CMakeLists.txt b/quanta/dialogs/settings/CMakeLists.txt
index c5d96b02..74396c31 100644
--- a/quanta/dialogs/settings/CMakeLists.txt
+++ b/quanta/dialogs/settings/CMakeLists.txt
@@ -14,6 +14,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/quanta/utility
   ${CMAKE_SOURCE_DIR}/quanta/parsers
   ${CMAKE_SOURCE_DIR}/quanta/src
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp
index 85d3065b..fcbd572e 100644
--- a/quanta/dialogs/settings/abbreviation.cpp
+++ b/quanta/dialogs/settings/abbreviation.cpp
@@ -31,7 +31,7 @@
 #include <tdelistview.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 //app includes
 #include "abbreviation.h"
@@ -98,7 +98,7 @@ void AbbreviationDlg::slotNewGroup()
       if (qConfig.abbreviations.contains(groupName))
       {
           KMessageBox::error(this, i18n("<qt>There is already an abbreviation group called <b>%1</b>. Choose an unique name for the new group.</qt>").arg(groupName), i18n("Group already exists"));
-          TQTimer::singleShot(0, this, TQT_SLOT(slotNewGroup()));
+          TQTimer::singleShot(0, this, TQ_SLOT(slotNewGroup()));
       } else
       {
          groupCombo->insertItem(groupName);
diff --git a/quanta/dialogs/settings/abbreviation.h b/quanta/dialogs/settings/abbreviation.h
index 39f49ff3..35120764 100644
--- a/quanta/dialogs/settings/abbreviation.h
+++ b/quanta/dialogs/settings/abbreviation.h
@@ -26,7 +26,7 @@ struct DTDStruct;
 
 class AbbreviationDlg : public AbbreviationDlgS
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   AbbreviationDlg(TQWidget *parent, const char *name = 0);
diff --git a/quanta/dialogs/settings/abbreviations.ui b/quanta/dialogs/settings/abbreviations.ui
index fc53fe16..7782617d 100644
--- a/quanta/dialogs/settings/abbreviations.ui
+++ b/quanta/dialogs/settings/abbreviations.ui
@@ -337,7 +337,7 @@
 <forwards>
     <forward>class TQListViewItem;</forward>
 </forwards>
-<Q_SLOTS>
+<slots>
     <slot>slotTemplateSelectionChanged(TQListViewItem*)</slot>
     <slot>dtdCombo_activated(const TQString&amp;)</slot>
     <slot>slotGroupChanged(const TQString&amp;)</slot>
@@ -348,10 +348,12 @@
     <slot>slotAddDTEP()</slot>
     <slot>slotRemoveDTEP()</slot>
     <slot>slotNewGroup()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-    <includehint>tdelistbox.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">tdelistview.h</include>
+	<include location="global" impldecl="in implementation">tdelistbox.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>
diff --git a/quanta/dialogs/settings/codetemplatedlgs.ui b/quanta/dialogs/settings/codetemplatedlgs.ui
index 7a1367b9..d7e28e55 100644
--- a/quanta/dialogs/settings/codetemplatedlgs.ui
+++ b/quanta/dialogs/settings/codetemplatedlgs.ui
@@ -72,10 +72,10 @@
     <tabstop>templateEdit</tabstop>
     <tabstop>descriptionEdit</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot>accept()</slot>
     <slot>reject()</slot>
     <slot>pushButton4_clicked()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/settings/filemasks.cpp b/quanta/dialogs/settings/filemasks.cpp
index fee135f8..5688b920 100644
--- a/quanta/dialogs/settings/filemasks.cpp
+++ b/quanta/dialogs/settings/filemasks.cpp
@@ -26,7 +26,7 @@
 FileMasks::FileMasks(TQWidget *parent, const char *name)
   :FileMasksS(parent,name)
 {
-  connect(buttonDefault, TQT_SIGNAL(clicked()), this, TQT_SLOT(setToDefault()));
+  connect(buttonDefault, TQ_SIGNAL(clicked()), this, TQ_SLOT(setToDefault()));
 }
 
 FileMasks::~FileMasks(){
diff --git a/quanta/dialogs/settings/filemasks.h b/quanta/dialogs/settings/filemasks.h
index 1a76334e..08f49cb1 100644
--- a/quanta/dialogs/settings/filemasks.h
+++ b/quanta/dialogs/settings/filemasks.h
@@ -23,7 +23,7 @@
 
 class FileMasks : public FileMasksS
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
   FileMasks(TQWidget *parent=0, const char *name=0);
diff --git a/quanta/dialogs/settings/parseroptions.h b/quanta/dialogs/settings/parseroptions.h
index 89058786..bd37836b 100644
--- a/quanta/dialogs/settings/parseroptions.h
+++ b/quanta/dialogs/settings/parseroptions.h
@@ -22,7 +22,7 @@ class TDEConfig;
 
 class ParserOptions : public ParserOptionsUI
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/quanta/dialogs/settings/previewoptions.h b/quanta/dialogs/settings/previewoptions.h
index f688d02d..d92315ed 100644
--- a/quanta/dialogs/settings/previewoptions.h
+++ b/quanta/dialogs/settings/previewoptions.h
@@ -23,7 +23,7 @@
 class TDEConfig;
 
 class PreviewOptions : public PreviewOptionsS  {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
   PreviewOptions(TQWidget *parent=0, const char *name=0);