TQt4 port kdegraphics

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 9 insertions, 9 deletions

diff --git a/kiconedit/kiconeditslots.cpp b/kiconedit/kiconeditslots.cpp
index ffcca476..63af706b 100644
--- a/kiconedit/kiconeditslots.cpp
+++ b/kiconedit/kiconeditslots.cpp
@@ -81,7 +81,7 @@ void KIconEdit::slotNew()
     if (grid->isModified())
     {
         int r = KMessageBox::warningYesNoCancel(this,
-        i18n("The current file has been modified.\nDo you want to save it?"), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard());
+        i18n("The current file has been modified.\nDo you want to save it?"), TQString(), KStdGuiItem::save(), KStdGuiItem::discard());
 
         switch(r)
         {
@@ -136,7 +136,7 @@ void KIconEdit::slotOpen()
     if( grid->isModified() )
     {
         int r = KMessageBox::warningYesNoCancel(this,
-      i18n("The current file has been modified.\nDo you want to save it?"),TQString::null, KStdGuiItem::save(), KStdGuiItem::discard());
+      i18n("The current file has been modified.\nDo you want to save it?"),TQString(), KStdGuiItem::save(), KStdGuiItem::discard());
 
         switch( r )
         {
@@ -195,7 +195,7 @@ void KIconEdit::slotPrint()
 {
     KPrinter printer;
 
-    if ( printer.setup(this, i18n("Print %1").arg(icon->url().section('/', -1))) )
+    if ( printer.setup(this, i18n("Print %1").tqarg(icon->url().section('/', -1))) )
     {
         int margin = 10, yPos = 0;
         printer.setCreator("KDE Icon Editor");
@@ -280,7 +280,7 @@ void KIconEdit::slotOpenRecent(const KURL& iconFile)
     if( grid->isModified() )
     {
         int r = KMessageBox::warningYesNoCancel(this,
-      i18n("The current file has been modified.\nDo you want to save it?"),TQString::null, KStdGuiItem::save(), KStdGuiItem::discard());
+      i18n("The current file has been modified.\nDo you want to save it?"),TQString(), KStdGuiItem::save(), KStdGuiItem::discard());
 
         switch( r )
         {
@@ -422,13 +422,13 @@ void KIconEdit::slotUpdateZoom( int s )
 
 void KIconEdit::slotUpdateStatusPos(int x, int y)
 {
-    TQString str = i18n("Status Position", "%1, %2").arg(x).arg(y);
+    TQString str = i18n("tqStatus Position", "%1, %2").tqarg(x).tqarg(y);
     statusbar->changeItem( str, 0);
 }
 
 void KIconEdit::slotUpdateStatusSize(int x, int y)
 {
-    TQString str = i18n("Status Size", "%1 x %2").arg(x).arg(y);
+    TQString str = i18n("tqStatus Size", "%1 x %2").tqarg(x).tqarg(y);
     statusbar->changeItem( str, 1);
 }
 
@@ -443,13 +443,13 @@ void KIconEdit::slotUpdateStatusScaling(int s)
 
 void KIconEdit::slotUpdateStatusColors(uint)
 {
-    TQString str = i18n("Colors: %1").arg(grid->numColors());
+    TQString str = i18n("Colors: %1").tqarg(grid->numColors());
     statusbar->changeItem( str, 3);
 }
 
 void KIconEdit::slotUpdateStatusColors(uint n, uint *)
 {
-    TQString str = i18n("Colors: %1").arg(n);
+    TQString str = i18n("Colors: %1").tqarg(n);
     statusbar->changeItem( str, 3);
 }
 
@@ -512,7 +512,7 @@ void KIconEdit::dragEnterEvent(TQDragEnterEvent* e)
 */
 void KIconEdit::dropEvent( TQDropEvent *e )
 {
-    //kdDebug(4640) << "Got QDropEvent!" << endl;
+    //kdDebug(4640) << "Got TQDropEvent!" << endl;
 
     KURL::List fileList;
     bool loadedinthis = false;