1 files changed, 18 insertions, 15 deletions

diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp
index a4066ee5a..240d9a810 100644
--- a/kate/app/kateviewspace.cpp
+++ b/kate/app/kateviewspace.cpp
@@ -30,6 +30,7 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <ksqueezedtextlabel.h>
+#include <kmimetype.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
@@ -39,6 +40,7 @@
 #include <tqcursor.h>
 #include <tqpopupmenu.h>
 #include <tqpixmap.h>
+#include <tqtooltip.h>
 
 //BEGIN KVSSBSep
 /*
@@ -139,8 +141,8 @@ void KateViewSpace::addView(Kate::View* v, bool show)
 
 void KateViewSpace::removeView(Kate::View* v)
 {
-  disconnect( v->getDoc(), TQT_SIGNAL(modifiedChanged()),
-              mStatusBar, TQT_SLOT(modifiedChanged()) );
+  disconnect( v->getDoc(), TQ_SIGNAL(modifiedChanged()),
+              mStatusBar, TQ_SLOT(modifiedChanged()) );
 
   bool active = ( v == currentView() );
 
@@ -168,12 +170,12 @@ bool KateViewSpace::showView(uint documentNumber)
   for( ; it.current(); --it ) {
     if (((Kate::Document*)it.current()->getDoc())->documentNumber() == documentNumber) {
       if ( currentView() )
-        disconnect( currentView()->getDoc(), TQT_SIGNAL(modifiedChanged()),
-                    mStatusBar, TQT_SLOT(modifiedChanged()) );
+        disconnect( currentView()->getDoc(), TQ_SIGNAL(modifiedChanged()),
+                    mStatusBar, TQ_SLOT(modifiedChanged()) );
 
       Kate::View* kv = it.current();
-      connect( kv->getDoc(), TQT_SIGNAL(modifiedChanged()),
-               mStatusBar, TQT_SLOT(modifiedChanged()) );
+      connect( kv->getDoc(), TQ_SIGNAL(modifiedChanged()),
+               mStatusBar, TQ_SLOT(modifiedChanged()) );
 
       mViewList.removeRef( kv );
       mViewList.append( kv );
@@ -311,36 +313,35 @@ KateVSStatusBar::KateVSStatusBar ( KateViewSpace *parent, const char *name )
 {
   m_lineColLabel = new TQLabel( this );
   addWidget( m_lineColLabel, 0, false );
-  m_lineColLabel->setAlignment( Qt::AlignCenter );
+  m_lineColLabel->setAlignment( TQt::AlignCenter );
   m_lineColLabel->installEventFilter( this );
 
   m_modifiedLabel = new TQLabel( TQString("   "), this );
   addWidget( m_modifiedLabel, 0, false );
-  m_modifiedLabel->setAlignment( Qt::AlignCenter );
+  m_modifiedLabel->setAlignment( TQt::AlignCenter );
   m_modifiedLabel->installEventFilter( this );
 
   m_insertModeLabel = new TQLabel( i18n(" INS "), this );
   addWidget( m_insertModeLabel, 0, false );
-  m_insertModeLabel->setAlignment( Qt::AlignCenter );
+  m_insertModeLabel->setAlignment( TQt::AlignCenter );
   m_insertModeLabel->installEventFilter( this );
 
   m_selectModeLabel = new TQLabel( i18n(" NORM "), this );
   addWidget( m_selectModeLabel, 0, false );
-  m_selectModeLabel->setAlignment( Qt::AlignCenter );
+  m_selectModeLabel->setAlignment( TQt::AlignCenter );
   m_selectModeLabel->installEventFilter( this );
 
   m_fileNameLabel=new KSqueezedTextLabel( this );
   addWidget( m_fileNameLabel, 1, true );
   m_fileNameLabel->setMinimumSize( 0, 0 );
   m_fileNameLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
-  m_fileNameLabel->setAlignment( /*Qt::AlignRight*/Qt::AlignLeft );
+  m_fileNameLabel->setAlignment( /*TQt::AlignRight*/TQt::AlignLeft );
   m_fileNameLabel->installEventFilter( this );
 
   installEventFilter( this );
   m_modPm = SmallIcon("modified");
   m_modDiscPm = SmallIcon("modonhd");
   m_modmodPm = SmallIcon("modmod");
-  m_noPm = SmallIcon("null");
 }
 
 KateVSStatusBar::~KateVSStatusBar ()
@@ -377,6 +378,8 @@ void KateVSStatusBar::updateMod( bool mod )
 
     bool modOnHD = info && info->modifiedOnDisc;
 
+    KMimeType::Ptr mime = KMimeType::findByURL(v->getDoc()->url());
+
     m_modifiedLabel->setPixmap(
         mod ?
           info && modOnHD ?
@@ -384,8 +387,9 @@ void KateVSStatusBar::updateMod( bool mod )
             m_modPm :
           info && modOnHD ?
             m_modDiscPm :
-        m_noPm
+            mime->pixmap(TDEIcon::Small)
         );
+    TQToolTip::add(this, mime->comment());
   }
 }
 
@@ -412,7 +416,7 @@ bool KateVSStatusBar::eventFilter(TQObject*,TQEvent *e)
     if ( m_viewSpace->currentView() )
       m_viewSpace->currentView()->setFocus();
 
-    if ( ((TQMouseEvent*)e)->button()==Qt::RightButton)
+    if ( ((TQMouseEvent*)e)->button()==TQt::RightButton)
       showMenu();
 
     return true;
@@ -421,4 +425,3 @@ bool KateVSStatusBar::eventFilter(TQObject*,TQEvent *e)
   return false;
 }
 //END KateVSStatusBar
-// kate: space-indent on; indent-width 2; replace-tabs on;