[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdesdk/kbabel/kbabeldict
From:       Laurent Montel <montel () kde ! org>
Date:       2006-06-21 14:53:18
Message-ID: 1150901598.022230.32542.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 553574 by mlaurent:

Fix compile


 M  +7 -13     kbabeldictbox.cpp  


--- trunk/KDE/kdesdk/kbabel/kbabeldict/kbabeldictbox.cpp #553573:553574
@@ -1524,7 +1524,7 @@
       if(e->id() == id)
       {
          QString caption = i18n("Configure Dictionary %1", e->name());
-         KDialog *dialog = new KDialogBase(this);
+         KDialog *dialog = new KDialog(this);
          dialog->setButtons( KDialog::Ok|KDialog::Apply|KDialog::Cancel|KDialog::Default );
          dialog->setDefaultButton( KDialog::Ok );
          dialog->setModal( modal );
@@ -1697,12 +1697,7 @@
                  msgid = result->found.first();
              }
 
-             DCOPClient *dcop = kapp->dcopClient();
-
-             DCOPCStringList list = dcop->registeredApplications();
-             int index = list.findIndex("kbabel");
-             if(index < 0)
-//             if(!dcop->isApplicationRegistered("kbabel"));
+             if ( !QDBus::sessionBus().busService()->nameHasOwner("kbabel") )
              {
                  kDebug(KBABELDICT) << "kbabel is not registered" << endl;
 
@@ -1723,14 +1718,13 @@
              }
              else
              {
-                 QByteArray data;
-                 QDataStream arg(&data, QIODevice::WriteOnly);
-                 arg << url.utf8() << msgid.utf8();
-                 if (!dcop->send("kbabel", "KBabelIFace"
-                         , "gotoFileEntry(QCString,QCString)",data))
+
+                 QDBusInterfacePtr kbabel("org.kde.kbabel", "/KBabel", "org.kde.kbabel.KBabel");
+                 QDBusReply<void> reply = kbabel->call("gotoFileEntry",url.utf8(),  msgid.utf8() );
+                 if (!reply.isSuccess())
                  {
                      KMessageBox::sorry(this
-                             ,i18n("There was an error using DCOP."));
+                             ,i18n("There was an error using dbus."));
                  }
              }
           }
[prev in list] [next in list] [prev in thread] [next in thread]