1 files changed, 15 insertions, 16 deletions
diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp
index 5ca29ef4f..38cd51aa5 100644
--- a/klipper/klipperpopup.cpp
+++ b/klipper/klipperpopup.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) 2004  Esben Mose Hansen <kde@mosehansen.dk>
    Copyright (C) by Andrew Stanley-Jones
@@ -46,16 +45,16 @@ namespace {
 #ifdef DEBUG_EVENTS__
 kdbgstream& operator<<( kdbgstream& stream,  const TQKeyEvent& e ) {
     stream << "(TQKeyEvent(text=" << e.text() << ",key=" << e.key() << ( e.isAccepted()?",accepted":",ignored)" ) << ",count=" << e.count();
-    if ( e.state() & Qt::AltButton ) {
+    if ( e.state() & TQt::AltButton ) {
         stream << ",ALT";
     }
-    if ( e.state() & Qt::ControlButton ) {
+    if ( e.state() & TQt::ControlButton ) {
         stream << ",CTRL";
     }
-    if ( e.state() & Qt::MetaButton ) {
+    if ( e.state() & TQt::MetaButton ) {
         stream << ",META";
     }
-    if ( e.state() & Qt::ShiftButton ) {
+    if ( e.state() & TQt::ShiftButton ) {
         stream << ",SHIFT";
     }
     if ( e.isAutoRepeat() ) {
@@ -113,7 +112,7 @@ KlipperPopup::KlipperPopup( History* history, TQWidget* parent, const char* name
 
     m_popupProxy = new PopupProxy( this, "popup_proxy", menu_height, menu_width );
 
-    connect( this, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) );
+    connect( this, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotAboutToShow() ) );
 }
 
 KlipperPopup::~KlipperPopup() {
@@ -146,7 +145,7 @@ void KlipperPopup::buildFromScratch() {
     m_filterWidget = new KLineEditBlackKey( this, "Klipper filter widget" );
     insertTitle( SmallIcon( "klipper" ), i18n("Klipper - Clipboard Tool"));
     m_filterWidgetId = insertItem( m_filterWidget, m_filterWidgetId, 1 );
-    m_filterWidget->setFocusPolicy( TQ_NoFocus );
+    m_filterWidget->setFocusPolicy( TQWidget::NoFocus );
     setItemVisible( m_filterWidgetId,  false );
     m_filterWidget->hide();
     TQString lastGroup;
@@ -250,15 +249,15 @@ void KlipperPopup::keyPressEvent( TQKeyEvent* e ) {
     // widget, except a few used for navigation:
     // These go to the superobject.
     switch( e->key() ) {
-    case Qt::Key_Up:
-    case Qt::Key_Down:
-    case Qt::Key_Right:
-    case Qt::Key_Left:
-    case Qt::Key_Tab:
-    case Qt::Key_Backtab:
-    case Qt::Key_Escape:
-    case Qt::Key_Return:
-    case Qt::Key_Enter:
+    case TQt::Key_Up:
+    case TQt::Key_Down:
+    case TQt::Key_Right:
+    case TQt::Key_Left:
+    case TQt::Key_Tab:
+    case TQt::Key_Backtab:
+    case TQt::Key_Escape:
+    case TQt::Key_Return:
+    case TQt::Key_Enter:
     {
 #ifdef DEBUG_EVENTS__
         kdDebug() << "Passing this event to ancestor (TDEPopupMenu): " << e << endl;