11 files changed, 27 insertions, 21 deletions
diff --git a/quanta/components/framewizard/CMakeLists.txt b/quanta/components/framewizard/CMakeLists.txt
index 0a1f83a1..c745467b 100644
--- a/quanta/components/framewizard/CMakeLists.txt
+++ b/quanta/components/framewizard/CMakeLists.txt
@@ -14,6 +14,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/lib
   ${CMAKE_SOURCE_DIR}/quanta/project
   ${CMAKE_SOURCE_DIR}/quanta/components/framewizard
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/quanta/components/framewizard/areaattributedb.h b/quanta/components/framewizard/areaattributedb.h
index a4e3a837..2d986a3b 100644
--- a/quanta/components/framewizard/areaattributedb.h
+++ b/quanta/components/framewizard/areaattributedb.h
@@ -25,7 +25,7 @@
   */
 
 class areaAttribute : public TQObject{
-    Q_OBJECT
+    TQ_OBJECT
   
 
     private:
diff --git a/quanta/components/framewizard/fmfpeditor.h b/quanta/components/framewizard/fmfpeditor.h
index 9080cc4d..d74ffa2e 100644
--- a/quanta/components/framewizard/fmfpeditor.h
+++ b/quanta/components/framewizard/fmfpeditor.h
@@ -25,7 +25,7 @@
   */
 
 class fmFPeditor : public fmFPeditorS  {
-  Q_OBJECT
+  TQ_OBJECT
   
   
   public: 
diff --git a/quanta/components/framewizard/fmfpeditors.ui b/quanta/components/framewizard/fmfpeditors.ui
index 3e024de5..fbd189b5 100644
--- a/quanta/components/framewizard/fmfpeditors.ui
+++ b/quanta/components/framewizard/fmfpeditors.ui
@@ -538,4 +538,7 @@
 </connections>
 <pixmapinproject/>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/quanta/components/framewizard/fmrceditor.h b/quanta/components/framewizard/fmrceditor.h
index abebe4ee..aff4e960 100644
--- a/quanta/components/framewizard/fmrceditor.h
+++ b/quanta/components/framewizard/fmrceditor.h
@@ -25,7 +25,7 @@
   */
 
 class fmRCeditor : public fmRCeditorS  {
-  Q_OBJECT
+  TQ_OBJECT
   
   public: 
     fmRCeditor();
diff --git a/quanta/components/framewizard/framewizard.cpp b/quanta/components/framewizard/framewizard.cpp
index 97cfadf0..6992d78e 100644
--- a/quanta/components/framewizard/framewizard.cpp
+++ b/quanta/components/framewizard/framewizard.cpp
@@ -33,14 +33,14 @@ m_hasSelected(false),m_saved(false)
 {
   m_hasSelected = false;
   m_currSA=vfe->internalTree()->root()->label();
-  connect(this, TQT_SIGNAL(launchDraw()), this, TQT_SLOT(draw()));
-  connect(vfe, TQT_SIGNAL(areaSelected(const TQString &)), this, TQT_SLOT(catchSelectedArea(const TQString &)));
+  connect(this, TQ_SIGNAL(launchDraw()), this, TQ_SLOT(draw()));
+  connect(vfe, TQ_SIGNAL(areaSelected(const TQString &)), this, TQ_SLOT(catchSelectedArea(const TQString &)));
 
-  connect(pbHorizontal, TQT_SIGNAL(clicked()), this, TQT_SLOT(split()));
-  connect(pbVertical, TQT_SIGNAL(clicked()), this, TQT_SLOT(split()));
-  connect(pbEditFrame, TQT_SIGNAL(clicked()), this, TQT_SLOT(showFrameEditorDlg()));
-  connect(pbReset, TQT_SIGNAL(clicked()), this, TQT_SLOT(reset()));
-  connect(pbDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(remove()));
+  connect(pbHorizontal, TQ_SIGNAL(clicked()), this, TQ_SLOT(split()));
+  connect(pbVertical, TQ_SIGNAL(clicked()), this, TQ_SLOT(split()));
+  connect(pbEditFrame, TQ_SIGNAL(clicked()), this, TQ_SLOT(showFrameEditorDlg()));
+  connect(pbReset, TQ_SIGNAL(clicked()), this, TQ_SLOT(reset()));
+  connect(pbDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(remove()));
 }
 
 FrameWizard::~FrameWizard(){
@@ -57,7 +57,7 @@ void FrameWizard::split(){
   if(m_hasSelected) {
     int split = 0;
     TQString currNodeLabel = m_currSA;
-    TQString senderName=TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name();
+    TQString senderName=sender()->name();
     if(senderName=="pbHorizontal"){
       split = showRCeditorDlg(i18n("Enter the desired number of rows:"));
       if(split>=2) vfe->split(currNodeLabel,split,HORIZONTAL);
diff --git a/quanta/components/framewizard/framewizard.h b/quanta/components/framewizard/framewizard.h
index c71a4e5a..fb40b029 100644
--- a/quanta/components/framewizard/framewizard.h
+++ b/quanta/components/framewizard/framewizard.h
@@ -25,7 +25,7 @@ class TQStringList;
 /** FrameWizard is the base class of the project */
 class FrameWizard : public FrameWizardS
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   private:
     bool m_hasSelected,
diff --git a/quanta/components/framewizard/framewizards.ui b/quanta/components/framewizard/framewizards.ui
index 3a3a1efd..22a702c0 100644
--- a/quanta/components/framewizard/framewizards.ui
+++ b/quanta/components/framewizard/framewizards.ui
@@ -363,7 +363,7 @@
 </connections>
 <pixmapinproject/>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>visualframeeditor.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">visualframeeditor.h</include>
+</includes>
 </UI>
diff --git a/quanta/components/framewizard/selectablearea.h b/quanta/components/framewizard/selectablearea.h
index 0efccc72..b31f3ab4 100644
--- a/quanta/components/framewizard/selectablearea.h
+++ b/quanta/components/framewizard/selectablearea.h
@@ -28,7 +28,7 @@
 
 
 class SelectableArea : public TDEHTMLPart  {
-   Q_OBJECT
+   TQ_OBJECT
   
 
    public :
diff --git a/quanta/components/framewizard/visualframeeditor.cpp b/quanta/components/framewizard/visualframeeditor.cpp
index 36974d0d..3f74574f 100644
--- a/quanta/components/framewizard/visualframeeditor.cpp
+++ b/quanta/components/framewizard/visualframeeditor.cpp
@@ -289,8 +289,8 @@ void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* parent){
     TQSplitter *splitter = new TQSplitter(parent,splitterName.ascii());
     if(SIZES.contains(splitterName)) splitter->setSizes( SIZES[splitterName] );
     switch( n->splitType() ){
-      case VERTICAL : splitter->setOrientation(Qt::Horizontal);break;
-      case HORIZONTAL : splitter->setOrientation(Qt::Vertical);break;
+      case VERTICAL : splitter->setOrientation(TQt::Horizontal);break;
+      case HORIZONTAL : splitter->setOrientation(TQt::Vertical);break;
       default:break;
     }
     n->firstChild();
@@ -307,8 +307,8 @@ void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* parent){
     sa->view()->setGeometry(n->atts()->geometry());
     sa->setIdLabel( n->label() );
     sa->setSource( n->atts()->src() );
-    connect(sa, TQT_SIGNAL(Resized(TQRect)), m_internalTree->findNode(sa->idLabel())->atts(), TQT_SLOT(setGeometry(TQRect)));
-    connect(sa, TQT_SIGNAL(selected(const TQString &)),this, TQT_SIGNAL(areaSelected(const TQString &)));
+    connect(sa, TQ_SIGNAL(Resized(TQRect)), m_internalTree->findNode(sa->idLabel())->atts(), TQ_SLOT(setGeometry(TQRect)));
+    connect(sa, TQ_SIGNAL(selected(const TQString &)),this, TQ_SIGNAL(areaSelected(const TQString &)));
   }
 }
 
diff --git a/quanta/components/framewizard/visualframeeditor.h b/quanta/components/framewizard/visualframeeditor.h
index 57ac82fe..69c51702 100644
--- a/quanta/components/framewizard/visualframeeditor.h
+++ b/quanta/components/framewizard/visualframeeditor.h
@@ -28,7 +28,7 @@
 
 
 class VisualFrameEditor : public TQHBox  {
-   Q_OBJECT
+   TQ_OBJECT
   
    private:
       enum MarkupLanguage{XHTML,HTML};