Replaced various '#define' with actual strings - part 5

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

7 files changed, 9 insertions, 9 deletions

diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp
index 9fb5cca..5d852e6 100644
--- a/kgpg/kgpginterface.cpp
+++ b/kgpg/kgpginterface.cpp
@@ -655,7 +655,7 @@ Md5Widget::Md5Widget(TQWidget *parent, const char *name,KURL url):KDialogBase( p
         f.open( IO_ReadOnly);
         KMD5 checkfile;
         checkfile.reset();
-        checkfile.update(*TQT_TQIODEVICE(&f));
+        checkfile.update(f);
         mdSum=checkfile.hexDigest().data();
         f.close();
         TQWidget *page = new TQWidget(this);
diff --git a/khexedit/lib/kcolumnsview.cpp b/khexedit/lib/kcolumnsview.cpp
index 4bb939a..c50385b 100644
--- a/khexedit/lib/kcolumnsview.cpp
+++ b/khexedit/lib/kcolumnsview.cpp
@@ -198,7 +198,7 @@ void KColumnsView::drawContents( TQPainter *P, int cx, int cy, int cw, int ch )
             break;
 
           // to avoid flickers we first paint to the linebuffer
-          Paint.begin( TQT_TQPAINTDEVICE(&LineBuffer), this );
+          Paint.begin( &LineBuffer, this );
 
           KColumn *C = RedrawColumns.first();
           Paint.translate( C->x(), 0 );
diff --git a/kjots/kjotsentry.cpp b/kjots/kjotsentry.cpp
index 03581cf..e09b468 100644
--- a/kjots/kjotsentry.cpp
+++ b/kjots/kjotsentry.cpp
@@ -264,7 +264,7 @@ bool KJotsBook::isBookFile(const TQString& filename)
     {
         if ( folder.open(IO_ReadWrite) )
         {
-            TQTextStream st(TQT_TQIODEVICE(&folder));
+            TQTextStream st(&folder);
             st.setEncoding( KJotsSettings::unicode() ? TQTextStream::UnicodeUTF8 : TQTextStream::Locale );
             TQString buf = st.readLine().stripWhiteSpace();
 
@@ -306,7 +306,7 @@ bool KJotsBook::openBook(const TQString& filename)
     
             if ( file.exists() && file.open(IO_ReadWrite) ) //TODO: Implement read-only mode?
             {
-                TQTextStream st(TQT_TQIODEVICE(&file));
+                TQTextStream st(&file);
                 st.setEncoding(  KJotsSettings::unicode() ? TQTextStream::UnicodeUTF8 : TQTextStream::Locale );
                 TQString data = st.read();
 
@@ -388,7 +388,7 @@ bool KJotsBook::openBook(const TQString& filename)
 */
 bool KJotsBook::loadOldBook(TQFile &file)
 {
-    TQTextStream st(TQT_TQIODEVICE(&file));
+    TQTextStream st(&file);
     st.setEncoding(  KJotsSettings::unicode() ? TQTextStream::UnicodeUTF8 : TQTextStream::Locale );
     TQString buf = st.readLine();
 
diff --git a/superkaramba/src/systemtray.cpp b/superkaramba/src/systemtray.cpp
index ab539cd..f8397de 100644
--- a/superkaramba/src/systemtray.cpp
+++ b/superkaramba/src/systemtray.cpp
@@ -62,7 +62,7 @@ void Systemtray::updateBackgroundPixmap ( const TQPixmap & pixmap) {
     //Stupid stupid stupid work around for annoying bug
     //QXEmbed ignores setBackgroundOrigin(AncestorOrigin)....
     TQPixmap bug = TQPixmap(emb->size());
-    bitBlt(TQT_TQPAINTDEVICE(&bug), 0, 0, TQT_TQPAINTDEVICE(const_cast<TQPixmap*>(&pixmap)), emb->parentWidget()->x()+emb->x(),  emb->parentWidget()->y()+emb->y(), emb->width(), emb->height(),TQt::CopyROP, false);
+    bitBlt(&bug, 0, 0, const_cast<TQPixmap*>(&pixmap), emb->parentWidget()->x()+emb->x(),  emb->parentWidget()->y()+emb->y(), emb->width(), emb->height(),TQt::CopyROP, false);
     emb->setPaletteBackgroundPixmap (bug);
 
   }
diff --git a/superkaramba/src/themelocale.cpp b/superkaramba/src/themelocale.cpp
index f451eaf..9f77c19 100644
--- a/superkaramba/src/themelocale.cpp
+++ b/superkaramba/src/themelocale.cpp
@@ -162,7 +162,7 @@ void ThemeLocale::setLanguage(const TQStringList &languages)
     if(m_theme->fileExists(file))
     {
       TQBuffer buffer(m_theme->readThemeFile(file));
-      tl_nl_load_domain(TQT_TQIODEVICE(&buffer), buffer.size(), &m_domain);
+      tl_nl_load_domain(&buffer, buffer.size(), &m_domain);
       m_language = *it;
       return;
     }
diff --git a/tdelirc/tdelirc/profileserver.cpp b/tdelirc/tdelirc/profileserver.cpp
index 1239b18..7e41e8e 100644
--- a/tdelirc/tdelirc/profileserver.cpp
+++ b/tdelirc/tdelirc/profileserver.cpp
@@ -66,7 +66,7 @@ void Profile::loadFromFile(const TQString &fileName)
 	curPAA = 0;
 
 	TQFile xmlFile(fileName);
-	TQXmlInputSource source(TQT_TQIODEVICE(&xmlFile));
+	TQXmlInputSource source(&xmlFile);
 	TQXmlSimpleReader reader;
 	reader.setContentHandler(this);
 	reader.parse(source);
diff --git a/tdelirc/tdelirc/remoteserver.cpp b/tdelirc/tdelirc/remoteserver.cpp
index dafa67d..e197578 100644
--- a/tdelirc/tdelirc/remoteserver.cpp
+++ b/tdelirc/tdelirc/remoteserver.cpp
@@ -58,7 +58,7 @@ void Remote::loadFromFile(const TQString &fileName)
 	curRB = 0;
 
 	TQFile xmlFile(fileName);
-	TQXmlInputSource source(TQT_TQIODEVICE(&xmlFile));
+	TQXmlInputSource source(&xmlFile);
 	TQXmlSimpleReader reader;
 	reader.setContentHandler(this);
 	reader.parse(source);