Enable kdepim compilation under Qt4

This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.


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

6 files changed, 36 insertions, 36 deletions

diff --git a/kandy/src/atcommand.cpp b/kandy/src/atcommand.cpp
index e43814b43..d010bb0bd 100644
--- a/kandy/src/atcommand.cpp
+++ b/kandy/src/atcommand.cpp
@@ -306,7 +306,7 @@ void ATCommand::extractParameters()
   TQStringList::ConstIterator end = paraList.end();
   int argNum = 1;
   while(it != end) {
-    addParameter(new ATParameter(*it,i18n("Arg %1").arg(TQString::number(argNum++)),
+    addParameter(new ATParameter(*it,i18n("Arg %1").tqarg(TQString::number(argNum++)),
                                  false));
     ++it;
   }
diff --git a/kandy/src/cmdpropertiesdialog_base.ui b/kandy/src/cmdpropertiesdialog_base.ui
index 57359e3e2..4b768c364 100644
--- a/kandy/src/cmdpropertiesdialog_base.ui
+++ b/kandy/src/cmdpropertiesdialog_base.ui
@@ -147,9 +147,9 @@
 <connections>
     <connection>
         <sender>mParameterList</sender>
-        <signal>rightButtonClicked(QListViewItem*,const QPoint&amp;,int)</signal>
+        <signal>rightButtonClicked(TQListViewItem*,const QPoint&amp;,int)</signal>
         <receiver>CmdPropertiesDialog_base</receiver>
-        <slot>editParameterName(QListViewItem*)</slot>
+        <slot>editParameterName(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>buttonOk</sender>
@@ -165,7 +165,7 @@
     </connection>
 </connections>
 <Q_SLOTS>
-    <slot>editParameterName(QListViewItem *)</slot>
+    <slot>editParameterName(TQListViewItem *)</slot>
     <slot access="protected">slotAccept()</slot>
 </Q_SLOTS>
 <tqlayoutdefaults spacing="6" margin="11"/>
diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp
index 4766947a2..5e68abe43 100644
--- a/kandy/src/kandy.cpp
+++ b/kandy/src/kandy.cpp
@@ -102,7 +102,7 @@ Kandy::~Kandy()
 void Kandy::load(const TQString& filename)
 {
   if (!mView->loadFile(filename)) {
-    KMessageBox::error(this,i18n("Could not load file %1").arg(filename));
+    KMessageBox::error(this,i18n("Could not load file %1").tqarg(filename));
   }
 
   mFilename = filename;
@@ -113,7 +113,7 @@ void Kandy::save(const TQString & filename)
 {
   if (!filename.isEmpty()) {
     if (!mView->saveFile(filename)) {
-      KMessageBox::error(this,i18n("Could not save file %1.").arg(filename));
+      KMessageBox::error(this,i18n("Could not save file %1.").tqarg(filename));
     } else {
       mFilename = filename;
       setTitle();
@@ -123,25 +123,25 @@ void Kandy::save(const TQString & filename)
 
 void Kandy::setupActions()
 {
-  KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
-  KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection());
-  KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection());
-//  KStdAction::print(this, TQT_SLOT(filePrint()), actionCollection());
-  KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
+  KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
+  KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection());
+  KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(fileSaveAs()), actionCollection());
+//  KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(filePrint()), actionCollection());
+  KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
 
   createStandardStatusBarAction();
   setStandardToolBarMenuEnabled(true);
     
-  KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
-  KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
-  KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
+  KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
+  KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+  KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection());
 
-  new KAction(i18n("Mobile GUI"),0,this,TQT_SLOT(showMobileGui()),
+  new KAction(i18n("Mobile GUI"),0,TQT_TQOBJECT(this),TQT_SLOT(showMobileGui()),
               actionCollection(),"show_mobilegui");
 
-  mConnectAction = new KAction(i18n("Connect"),0,this,TQT_SLOT(modemConnect()),
+  mConnectAction = new KAction(i18n("Connect"),0,TQT_TQOBJECT(this),TQT_SLOT(modemConnect()),
                                actionCollection(),"modem_connect");
-  mDisconnectAction = new KAction(i18n("Disconnect"),0,this,
+  mDisconnectAction = new KAction(i18n("Disconnect"),0,TQT_TQOBJECT(this),
                                   TQT_SLOT(modemDisconnect()),actionCollection(),
                                   "modem_disconnect");
 
@@ -300,7 +300,7 @@ bool Kandy::queryClose()
 {
   if (mView->isModified()) {
     switch (KMessageBox::warningYesNoCancel(this,
-        i18n("Save changes to profile %1?").arg(mFilename), TQString(), KStdGuiItem::save(), KStdGuiItem::discard())) {
+        i18n("Save changes to profile %1?").tqarg(mFilename), TQString(), KStdGuiItem::save(), KStdGuiItem::discard())) {
       case KMessageBox::Yes :
         fileSave();
         return true;
@@ -319,7 +319,7 @@ void Kandy::modemConnect()
   if (!mScheduler->modem()->open()) {
     KMessageBox::sorry(this,
         i18n("Cannot open modem tqdevice %1.")
-        .arg(KandyPrefs::serialDevice()), i18n("Modem Error"));
+        .tqarg(KandyPrefs::serialDevice()), i18n("Modem Error"));
     return;
   }
 
diff --git a/kandy/src/kandyview.cpp b/kandy/src/kandyview.cpp
index 38fcb9cb1..6e76235be 100644
--- a/kandy/src/kandyview.cpp
+++ b/kandy/src/kandyview.cpp
@@ -65,7 +65,7 @@ KandyView::KandyView(CommandScheduler *scheduler,TQWidget *tqparent)
 
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
 
-  TQSplitter *mainSplitter = new TQSplitter( Horizontal, this );
+  TQSplitter *mainSplitter = new TQSplitter( Qt::Horizontal, this );
   topLayout->addWidget( mainSplitter );
 
   TQWidget *commandBox = new TQWidget( mainSplitter );
@@ -99,7 +99,7 @@ KandyView::KandyView(CommandScheduler *scheduler,TQWidget *tqparent)
   commandLayout->addWidget( buttonExecute );
   connect( buttonExecute, TQT_SIGNAL( clicked() ), TQT_SLOT( executeCommand() ) );
 
-  TQSplitter *ioSplitter = new TQSplitter( Vertical, mainSplitter );
+  TQSplitter *ioSplitter = new TQSplitter( Qt::Vertical, mainSplitter );
 
   TQWidget *inBox = new TQWidget( ioSplitter );
   
@@ -250,7 +250,7 @@ void KandyView::executeCommand()
       if (p->userInput()) {
         bool ok = false;
         TQString value = KInputDialog::getText(TQString(),
-            i18n("Enter value for %1:").arg(p->name()),TQString(),&ok,this);
+            i18n("Enter value for %1:").tqarg(p->name()),TQString(),&ok,this);
         if (!ok)
           return;
         p->setValue(value);
diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp
index 7b39d8d30..de3e2b3e8 100644
--- a/kandy/src/mobilemain.cpp
+++ b/kandy/src/mobilemain.cpp
@@ -71,17 +71,17 @@ MobileMain::~MobileMain()
 
 void MobileMain::setupActions()
 {
-  KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
+  KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
 
-  new KAction(i18n("Terminal"),0,this,TQT_SLOT(showTerminal()),
+  new KAction(i18n("Terminal"),0,TQT_TQOBJECT(this),TQT_SLOT(showTerminal()),
               actionCollection(),"show_terminal");
 
   createStandardStatusBarAction();
   setStandardToolBarMenuEnabled(true);
    
-  KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
-  KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
-  KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
+  KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
+  KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+  KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection());
 
   createGUI("kandymobileui.rc");
 }
@@ -169,7 +169,7 @@ bool MobileMain::queryClose()
 #if 0
   if (m_view->isModified()) {
     switch (KMessageBox::warningYesNoCancel(this,
-        i18n("Save changes to profile %1?").arg(mFilename))) {
+        i18n("Save changes to profile %1?").tqarg(mFilename))) {
       case KMessageBox::Yes :
         fileSave();
         return true;
diff --git a/kandy/src/modem.cpp b/kandy/src/modem.cpp
index 4b085de6a..113f2e4bc 100644
--- a/kandy/src/modem.cpp
+++ b/kandy/src/modem.cpp
@@ -196,7 +196,7 @@ bool Modem::open()
   if ( ( fd = ::open( fdev, O_RDWR | O_NOCTTY | O_NONBLOCK ) ) == -1 ) {
     emit errorMessage( i18n( "Unable to open tqdevice '%1'. "
                              "Please check that you have sufficient permissions." )
-                             .arg( fdev ) );
+                             .tqarg( fdev ) );
     return false;
   }
 
@@ -204,7 +204,7 @@ bool Modem::open()
   if ( tcgetattr( fd, &init_tty ) == -1 ) {
     int errnumber = errno;
     emit errorMessage( i18n( "Communication setup failed (tcgetattr code: %1)" )
-        .arg(strerror(errnumber)) );
+        .tqarg(strerror(errnumber)) );
     ::close( fd );
     fd = 0;
     return false;
@@ -279,7 +279,7 @@ bool Modem::lockDevice()
 #ifdef HAVE_LOCKDEV
   is_locked = !dev_lock( (*prefs).serialDevice().local8Bit() );
   if (!is_locked)
-      emit errorMessage( i18n( "Unable to lock tqdevice '%1'." ).arg(
+      emit errorMessage( i18n( "Unable to lock tqdevice '%1'." ).tqarg(
                              (*prefs).serialDevice() ));
   return is_locked;
 #else
@@ -299,7 +299,7 @@ bool Modem::lockDevice()
 
     if ( ( lfd = ::open( TQFile::encodeName( fileName ), O_RDONLY ) ) < 0 ) {
       emit errorMessage( i18n( "Unable to open lock file '%1'.")
-                               .arg( fileName ) );
+                               .tqarg( fileName ) );
       return false;
     }
 
@@ -307,7 +307,7 @@ bool Modem::lockDevice()
 
     if ( count < 0 ) {
        emit errorMessage( i18n( "Unable to read lock file '%1'.")
-                                .arg( fileName ) );
+                                .tqarg( fileName ) );
        ::close( lfd );
        return false;
     }
@@ -317,13 +317,13 @@ bool Modem::lockDevice()
     count = sscanf( buf, "%d", &pid );
     if ( ( count != 1 ) || ( pid <= 0 ) ) {
        emit errorMessage( i18n( "Unable to get PID from file '%1'.")
-                                .arg( fileName ) );
+                                .tqarg( fileName ) );
        return false;
     }
 
     if ( !kill( (pid_t) pid, 0 ) ) {
        emit errorMessage( i18n( "Process with PID %1, which is locking the tqdevice, is still running.")
-                                .arg( pid ) );
+                                .tqarg( pid ) );
        return false;
     }
 
@@ -336,7 +336,7 @@ bool Modem::lockDevice()
   if ( ( lfd = creat( TQFile::encodeName( fileName ).data(), 0644 ) ) == -1 ) {
     emit errorMessage( i18n( "Unable to create lock file '%1'. "
                              "Please check that you have sufficient permissions.")
-                             .arg( fileName ) );
+                             .tqarg( fileName ) );
     return false;
   }