Commit ae3318d7 authored by Laurent Montel's avatar Laurent Montel 😁

Start to fix compile

svn path=/trunk/KDE/kdesdk/cervisia/; revision=467154
parent 17fd973f
......@@ -44,6 +44,7 @@
#include <kdebug.h>
#include <kmessagebox.h>
#include <kglobal.h>
#include <ktoolinvocation.h>
#include "progressdlg.h"
#include "logdlg.h"
......@@ -105,7 +106,7 @@ CervisiaPart::CervisiaPart( QWidget *parentWidget, const char *widgetName,
, m_currentEditMenu(0)
, m_jobType(Unknown)
{
KGlobal::locale()->insertCatalogue("cervisia");
KGlobal::locale()->insertCatalog("cervisia");
setInstance( CervisiaFactory::instance() );
m_browserExt = new CervisiaBrowserExtension( this );
......@@ -113,7 +114,7 @@ CervisiaPart::CervisiaPart( QWidget *parentWidget, const char *widgetName,
// start the cvs DCOP service
QString error;
QByteArray appId;
if( KApplication::startServiceByDesktopName("cvsservice", QStringList(), &error, &appId) )
if( KToolInvocation::startServiceByDesktopName("cvsservice", QStringList(), &error, &appId) )
{
KMessageBox::sorry(0, i18n("Starting cvsservice failed with message: ") +
error, "Cervisia");
......@@ -1626,14 +1627,14 @@ void CervisiaPart::slotConfigure()
void CervisiaPart::slotHelp()
{
emit setStatusBarText( i18n("Invoking help on Cervisia") );
KApplication::startServiceByDesktopName("khelpcenter", QString("help:/cervisia/index.html"));
KToolInvocation::startServiceByDesktopName("khelpcenter", QString("help:/cervisia/index.html"));
}
void CervisiaPart::slotCVSInfo()
{
emit setStatusBarText( i18n("Invoking help on CVS") );
KApplication::startServiceByDesktopName("khelpcenter", QString("info:/cvs/Top"));
KToolInvocation::startServiceByDesktopName("khelpcenter", QString("info:/cvs/Top"));
}
......@@ -1898,7 +1899,7 @@ void CervisiaPart::guiActivateEvent(KParts::GUIActivateEvent* event)
CervisiaBrowserExtension::CervisiaBrowserExtension( CervisiaPart *p )
: KParts::BrowserExtension( p, "CervisiaBrowserExtension" )
{
KGlobal::locale()->insertCatalogue("cervisia");
KGlobal::locale()->insertCatalog("cervisia");
}
CervisiaBrowserExtension::~CervisiaBrowserExtension()
......
......@@ -79,7 +79,7 @@ CervisiaShell::CervisiaShell( const char *name )
setAutoSaveSettings("MainWindow", true);
// if the session is restoring, we already read the settings
if( !kapp->isRestored() )
if( !kapp->isSessionRestored() )
readSettings();
}
......@@ -183,7 +183,7 @@ void CervisiaShell::readProperties(KConfig* config)
// if the session is restoring, make sure we open the URL
// since it's not handled by main()
if( kapp->isRestored() )
if( kapp->isSessionRestored() )
openURL();
}
......
......@@ -30,7 +30,7 @@ How-to use this service in C++ applications:
QString error;
QCString appId;
KApplication::startServiceByDesktopName("cvsservice", QStringList(), &error,
KToolInvocation::startServiceByDesktopName("cvsservice", QStringList(), &error,
&appId);
// create stub for repository
......
......@@ -91,10 +91,10 @@ void LogPlainView::searchText(int options, const QString& pattern)
connect(m_find, SIGNAL(findNext()),
this, SLOT(findNext()));
m_currentBlock = (m_find->options() & KFindDialog::FindBackwards)
m_currentBlock = (m_find->options() & KFind::FindBackwards)
? document()->end().previous()
: document()->begin();
if( options & KFindDialog::FromCursor )
if( options & KFind::FromCursor )
{
#warning maybe this can be improved
const QPoint pos(horizontalScrollBar()->value(), 0);
......@@ -128,7 +128,7 @@ void LogPlainView::findNext()
if( res == KFind::NoMatch )
{
if( m_find->options() & KFindDialog::FindBackwards )
if( m_find->options() & KFind::FindBackwards )
m_currentBlock = m_currentBlock.previous();
else
m_currentBlock = m_currentBlock.next();
......@@ -140,7 +140,7 @@ void LogPlainView::findNext()
{
if( m_find->shouldRestart() )
{
m_currentBlock = (m_find->options() & KFindDialog::FindBackwards)
m_currentBlock = (m_find->options() & KFind::FindBackwards)
? document()->end().previous()
: document()->begin();
findNext();
......
......@@ -27,6 +27,7 @@
#include <kconfig.h>
#include <klocale.h>
#include <kurl.h>
#include <ktoolinvocation.h>
#include "misc.h"
#include "cervisiashell.h"
......@@ -43,7 +44,7 @@ static CvsService_stub* StartDCOPService(const QString& directory)
// start the cvs DCOP service
QString error;
QByteArray appId;
if( KApplication::startServiceByDesktopName("cvsservice", QStringList(),
if( KToolInvocation::startServiceByDesktopName("cvsservice", QStringList(),
&error, &appId) )
{
std::cerr << "Starting cvsservice failed with message: "
......
......@@ -85,7 +85,7 @@ ProgressDialog::~ProgressDialog()
void ProgressDialog::setupGui(const QString& heading)
{
Q3VBox* vbox = makeVBoxMainWidget();
KVBox* vbox = makeVBoxMainWidget();
vbox->setSpacing(10);
QWidget* headingBox = new QWidget(vbox);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment