5 files changed, 20 insertions, 17 deletions
diff --git a/quanta/messages/CMakeLists.txt b/quanta/messages/CMakeLists.txt
index 8e2d1d40..9552040a 100644
--- a/quanta/messages/CMakeLists.txt
+++ b/quanta/messages/CMakeLists.txt
@@ -16,6 +16,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/quanta/project
   ${CMAKE_SOURCE_DIR}/quanta/parsers
   ${CMAKE_SOURCE_DIR}/quanta/utility
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp
index 418f7f17..892f6dc9 100644
--- a/quanta/messages/annotationoutput.cpp
+++ b/quanta/messages/annotationoutput.cpp
@@ -50,7 +50,7 @@ AnnotationOutput::AnnotationOutput(TQWidget *parent, const char *name)
   m_yourAnnotations->setLineWidth(2);
   addTab(m_yourAnnotations, i18n("For You"));
   
-  connect(m_yourAnnotations, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(yourAnnotationsItemExecuted(TQListViewItem *)));
+  connect(m_yourAnnotations, TQ_SIGNAL(executed(TQListViewItem*)), TQ_SLOT(yourAnnotationsItemExecuted(TQListViewItem *)));
 
   m_allAnnotations = new TDEListView(this);
   m_allAnnotations->addColumn("1", -1);
@@ -59,14 +59,14 @@ AnnotationOutput::AnnotationOutput(TQWidget *parent, const char *name)
   m_allAnnotations->header()->hide();
   m_allAnnotations->setSorting(1);
   m_allAnnotations->setLineWidth(2);
-  connect(m_allAnnotations, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(allAnnotationsItemExecuted(TQListViewItem *)));
+  connect(m_allAnnotations, TQ_SIGNAL(executed(TQListViewItem*)), TQ_SLOT(allAnnotationsItemExecuted(TQListViewItem *)));
   addTab(m_allAnnotations, i18n("All Files"));
 
 
-  connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_SLOT(tabChanged(TQWidget*)));
+  connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), TQ_SLOT(tabChanged(TQWidget*)));
 
   m_updateTimer = new TQTimer(this);
-  connect(m_updateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateNextFile()));
+  connect(m_updateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateNextFile()));
 
   m_yourAnnotationsNum = 0;
 }
@@ -324,7 +324,7 @@ void AnnotationOutput::updateAnnotationForFile(const KURL& url)
           } else
             pos++;
           int pos2 = line.find(rx);
-          annotations.insert(i, tqMakePair(line.mid(pos, pos2 - pos).stripWhiteSpace(), receiver));
+          annotations.insert(i, qMakePair(line.mid(pos, pos2 - pos).stripWhiteSpace(), receiver));
         }
         ++i;
       }
diff --git a/quanta/messages/annotationoutput.h b/quanta/messages/annotationoutput.h
index 850b3e7c..d2060142 100644
--- a/quanta/messages/annotationoutput.h
+++ b/quanta/messages/annotationoutput.h
@@ -36,7 +36,7 @@ enum AnnotationScope
 
 class AnnotationOutput : public KTabWidget
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
     AnnotationOutput(TQWidget *parent = 0, const char *name = 0);
diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp
index 06625c74..6aae9836 100644
--- a/quanta/messages/messageoutput.cpp
+++ b/quanta/messages/messageoutput.cpp
@@ -38,20 +38,20 @@ MessageOutput::MessageOutput(TQWidget *parent, const char *name )
   m_maxItems = 2000;
 
   TQPalette pal = palette();
-  pal.setColor(TQColorGroup::HighlightedText, pal.color(TQPalette::Normal, TQColorGroup::Text));
-  pal.setColor(TQColorGroup::Highlight,       pal.color(TQPalette::Normal, TQColorGroup::Mid));
+  pal.setColor(TQColorGroup::HighlightedText, pal.color(TQPalette::Active, TQColorGroup::Text));
+  pal.setColor(TQColorGroup::Highlight,       pal.color(TQPalette::Active, TQColorGroup::Mid));
   setPalette(pal);
-  setFocusPolicy( TQ_NoFocus );
+  setFocusPolicy( TQWidget::NoFocus );
 
   m_popupMenu = new TDEPopupMenu(this);
-  connect(this, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)),
-     this, TQT_SLOT(showMenu(TQListBoxItem*, const TQPoint&)));
-  m_popupMenu->insertItem( SmallIconSet("edit-copy"), i18n("&Copy"), this, TQT_SLOT(copyContent()) ) ;
-  m_popupMenu->insertItem( SmallIconSet("document-save-as"), i18n("&Save As..."), this, TQT_SLOT(saveContent()) ) ;
+  connect(this, TQ_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)),
+     this, TQ_SLOT(showMenu(TQListBoxItem*, const TQPoint&)));
+  m_popupMenu->insertItem( SmallIconSet("edit-copy"), i18n("&Copy"), this, TQ_SLOT(copyContent()) ) ;
+  m_popupMenu->insertItem( SmallIconSet("document-save-as"), i18n("&Save As..."), this, TQ_SLOT(saveContent()) ) ;
   m_popupMenu->insertSeparator();
-  m_popupMenu->insertItem( SmallIconSet("edit-clear"), i18n("Clear"), this, TQT_SLOT(clear()) ) ;
+  m_popupMenu->insertItem( SmallIconSet("edit-clear"), i18n("Clear"), this, TQ_SLOT(clear()) ) ;
 
-  connect( this, TQT_SIGNAL(clicked(TQListBoxItem*)), TQT_SLOT(clickItem(TQListBoxItem*)) );
+  connect( this, TQ_SIGNAL(clicked(TQListBoxItem*)), TQ_SLOT(clickItem(TQListBoxItem*)) );
 }
 
 MessageOutput::~MessageOutput()
@@ -146,7 +146,7 @@ TQString MessageOutput::content()
 
 void MessageOutput::copyContent()
 {
-  kapp->clipboard()->setText(content(), TQClipboard::Clipboard);
+  tdeApp->clipboard()->setText(content(), TQClipboard::Clipboard);
 }
 
 void MessageOutput::saveContent()
diff --git a/quanta/messages/messageoutput.h b/quanta/messages/messageoutput.h
index f958ac00..8a67922b 100644
--- a/quanta/messages/messageoutput.h
+++ b/quanta/messages/messageoutput.h
@@ -31,7 +31,7 @@ weblint output
   */
 
 class MessageOutput : public TQListBox  {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
   MessageOutput(TQWidget *parent=0, const char *name=0);