Commit 44f42e4a authored by Michael Reeves's avatar Michael Reeves
Browse files

*try again to resolve kcomponentdata/KAboutData confusion in clang

*port KStatusBar->QStatusBar.
*resolve hidden virtual function warning
--Why is ContextFreeTranslator even here?
parent c81717f0
......@@ -39,11 +39,12 @@
#include <QPrintDialog>
// include files for KDE
#include <KDELibs4Support/kcomponentdata.h>
#include <kiconloader.h>
#include <kmessagebox.h>
#include <kfiledialog.h>
#include <QMenuBar>
#include <kstatusbar.h>
#include <QStatusBar>
#include <klocale.h>
#include <kconfig.h>
#include <kstandardaction.h>
......@@ -77,7 +78,7 @@ KActionCollection* KDiff3App::actionCollection()
return m_pKDiff3Shell->actionCollection();
}
KStatusBar* KDiff3App::statusBar()
QStatusBar* KDiff3App::statusBar()
{
if ( m_pKDiff3Shell==0 )
return 0;
......@@ -159,7 +160,7 @@ KDiff3App::KDiff3App(QWidget* pParent, const char* /*name*/, KDiff3Part* pKDiff3
// This is just a convenience variable to make code that accesses options more readable
m_pOptions = &m_pOptionDialog->m_options;
m_pOptionDialog->readOptions( isPart() ? KComponentData(m_pKDiff3Part->componentData()).config() : KGlobal::config() );
m_pOptionDialog->readOptions( isPart() ? m_pKDiff3Part->componentData()).config() : KGlobal::config() );
// Option handling: Only when pParent==0 (no parent)
KCmdLineArgs *args = isPart() ? 0 : KCmdLineArgs::parsedArgs();
......
......@@ -319,7 +319,7 @@ class KDiff3App : public QSplitter
void choose(int choice);
KActionCollection* actionCollection();
KStatusBar* statusBar();
QStatusBar* statusBar();
KToolBar* toolBar(const char*);
KDiff3Part* m_pKDiff3Part;
KParts::MainWindow* m_pKDiff3Shell;
......
......@@ -20,7 +20,7 @@
#include "kdiff3_part.h"
#include <K4AboutData>
#include <kcomponentdata.h>
#include <KDELibs4Support/kcomponentdata.h>
#include <QAction>
#include <kstandardaction.h>
#include <kfiledialog.h>
......@@ -71,7 +71,7 @@ KDiff3Part::~KDiff3Part()
{
if ( m_widget!=0 && ! m_bIsShell )
{
m_widget->saveOptions( m_widget->isPart() ? KComponentData(componentData()).config() : KGlobal::config() );
m_widget->saveOptions( m_widget->isPart() ? componentData()).config() : KGlobal::config() );
}
}
......
......@@ -33,7 +33,7 @@
#include <klibloader.h>
#include <kmessagebox.h>
#include <kstatusbar.h>
#include <QStatusBar>
#include <klocale.h>
#include <QStatusBar>
......
......@@ -109,10 +109,10 @@ class ContextFreeTranslator : public QTranslator
{
public:
ContextFreeTranslator( QObject* pParent ) : QTranslator(pParent) {}
QString translate(const char* context, const char* sourceText, const char* comment ) const
virtual QString translate(const char* context, const char* sourceText, const char* comment ) const
{
if ( context != 0 )
return QTranslator::translate(0,sourceText,comment);
return QTranslator::translate(0,sourceText,comment, -1);
else
return QString();
}
......
......@@ -41,7 +41,7 @@
#include <klocale.h>
#include <kmessagebox.h>
#include <kfontdialog.h>
#include <kstatusbar.h>
#include <QStatusBar.h>
#include <assert.h>
......
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