Commit 674b662c authored by Hamish Rodda's avatar Hamish Rodda

Compile with new kdelibs snapshot:

Q3PopupMenu -> QMenu
KAction constructors remove, port to new constructors
K3URLDrag -> KURL::List::*
Qt::ButtonState -> replacements
latin1() -> toLatin1()

probably a lot more too

svn path=/trunk/KDE/kdebase/konqueror/; revision=469927
parent 1ba38a2e
......@@ -231,10 +231,10 @@ KonqKfmIconView::KonqKfmIconView( QWidget *parentWidget, QObject *parent, const
for ( KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it )
{
if ( KToggleAction*& preview = previewActions[ ( *it )->name() ] )
preview->setName( Q3CString( preview->name() ) + ',' + ( *it )->desktopEntryName().latin1() );
preview->setName( Q3CString( preview->name() ) + ',' + ( *it )->desktopEntryName().toLatin1() );
else
{
preview = new KToggleAction( (*it)->name(), 0, actionCollection(), (*it)->desktopEntryName().latin1() );
preview = new KToggleAction( (*it)->name(), 0, actionCollection(), (*it)->desktopEntryName().toLatin1() );
connect( preview, SIGNAL( toggled( bool ) ), this, SLOT( slotPreview( bool ) ) );
m_pamPreview->insert( preview );
m_paPreviewPlugins.append( preview );
......@@ -273,7 +273,7 @@ KonqKfmIconView::KonqKfmIconView( QWidget *parentWidget, QObject *parent, const
//enable menu item representing the saved sorting criterion
QString sortcrit = KonQ3IconViewFactory::defaultViewProps()->sortCriterion();
KRadioAction *sort_action = dynamic_cast<KRadioAction *>(actionCollection()->action(sortcrit.latin1()));
KRadioAction *sort_action = dynamic_cast<KRadioAction *>(actionCollection()->action(sortcrit.toLatin1()));
if(sort_action!=NULL) sort_action->activate();
m_paSortDirsFirst = new KToggleAction( i18n( "Folders First" ), 0, actionCollection(), "sort_directoriesfirst" );
......
......@@ -43,7 +43,7 @@ template class Q3PtrList<KonqHistoryEntry>;
//static - used by KonqHistoryAction and KonqBidiHistoryAction
void KonqBidiHistoryAction::fillHistoryPopup( const Q3PtrList<HistoryEntry> &history,
Q3PopupMenu * popup,
QMenu * popup,
bool onlyBack,
bool onlyForward,
bool checkCurrentItem,
......@@ -83,8 +83,8 @@ void KonqBidiHistoryAction::fillHistoryPopup( const Q3PtrList<HistoryEntry> &his
///////////////////////////////
KonqBidiHistoryAction::KonqBidiHistoryAction ( const QString & text, QObject* parent, const char* name )
: KAction( text, 0, parent, name )
KonqBidiHistoryAction::KonqBidiHistoryAction ( const QString & text, KActionCollection* parent, const char* name )
: KAction( text, KShortcut(), 0L, "", parent, name )
{
setShortcutConfigurable(false);
m_firstIndex = 0;
......@@ -99,7 +99,7 @@ int KonqBidiHistoryAction::plug( QWidget *widget, int index )
// Go menu
if ( widget->inherits("QPopupMenu") )
{
m_goMenu = (Q3PopupMenu*)widget;
m_goMenu = (QMenu*)widget;
// Forward signal (to main view)
connect( m_goMenu, SIGNAL( aboutToShow() ),
this, SIGNAL( menuAboutToShow() ) );
......@@ -171,29 +171,29 @@ void KonqBidiHistoryAction::slotActivated( int id )
///////////////////////////////
KonqLogoAction::KonqLogoAction( const QString& text, int accel, QObject* parent, const char* name )
: KAction( text, accel, parent, name )
KonqLogoAction::KonqLogoAction( const QString& text, const KShortcut& accel, KActionCollection* parent, const char* name )
: KAction( text, accel, 0L, "", parent, name )
{
}
KonqLogoAction::KonqLogoAction( const QString& text, int accel,
QObject* receiver, const char* slot, QObject* parent, const char* name )
KonqLogoAction::KonqLogoAction( const QString& text, const KShortcut& accel,
QObject* receiver, const char* slot, KActionCollection* parent, const char* name )
: KAction( text, accel, receiver, slot, parent, name )
{
}
KonqLogoAction::KonqLogoAction( const QString& text, const QIcon& pix, int accel, QObject* parent, const char* name )
: KAction( text, pix, accel, parent, name )
KonqLogoAction::KonqLogoAction( const QString& text, const QIcon& pix, const KShortcut& accel, KActionCollection* parent, const char* name )
: KAction( text, pix, accel, 0L, "", parent, name )
{
}
KonqLogoAction::KonqLogoAction( const QString& text, const QIcon& pix,int accel, QObject* receiver, const char* slot, QObject* parent, const char* name )
KonqLogoAction::KonqLogoAction( const QString& text, const QIcon& pix, const KShortcut& accel, QObject* receiver, const char* slot, KActionCollection* parent, const char* name )
: KAction( text, pix, accel, receiver, slot, parent, name )
{
}
KonqLogoAction::KonqLogoAction( const QStringList& icons, QObject* receiver,
const char* slot, QObject* parent,
const char* slot, KActionCollection* parent,
const char* name )
: KAction( 0L, 0, receiver, slot, parent, name ) // text missing !
{
......@@ -209,7 +209,7 @@ void KonqLogoAction::start()
if ( w->inherits( "KToolBar" ) )
{
KAnimWidget *anim = ((KToolBar *)w)->animatedWidget( menuId( i ) );
KAnimWidget *anim = ((KToolBar *)w)->animatedWidget( itemId( i ) );
anim->start();
}
}
......@@ -224,7 +224,7 @@ void KonqLogoAction::stop()
if ( w->inherits( "KToolBar" ) )
{
KAnimWidget *anim = ((KToolBar *)w)->animatedWidget( menuId( i ) );
KAnimWidget *anim = ((KToolBar *)w)->animatedWidget( itemId( i ) );
anim->stop();
}
}
......@@ -236,7 +236,7 @@ void KonqLogoAction::updateIcon(int id)
if ( w->inherits( "KToolBar" ) )
{
KAnimWidget *anim = ((KToolBar *)w)->animatedWidget( menuId( id ) );
KAnimWidget *anim = ((KToolBar *)w)->animatedWidget( itemId( id ) );
anim->setIcons(icon());
}
}
......@@ -282,10 +282,10 @@ int KonqLogoAction::plug( QWidget *widget, int index )
///////////
KonqViewModeAction::KonqViewModeAction( const QString &text, const QString &icon,
QObject *parent, const char *name )
: KRadioAction( text, icon, 0, parent, name )
KActionCollection *parent, const char *name )
: KRadioAction( text, icon, 0, 0L, "", parent, name )
{
m_menu = new Q3PopupMenu;
m_menu = new QMenu;
connect( m_menu, SIGNAL( aboutToShow() ),
this, SLOT( slotPopupAboutToShow() ) );
......@@ -352,7 +352,7 @@ MostOftenList * KonqMostOftenURLSAction::s_mostEntries = 0L;
uint KonqMostOftenURLSAction::s_maxEntries = 0;
KonqMostOftenURLSAction::KonqMostOftenURLSAction( const QString& text,
QObject *parent,
KActionCollection *parent,
const char *name )
: KActionMenu( text, "goto", parent, name )
{
......@@ -465,7 +465,7 @@ void KonqMostOftenURLSAction::slotFillMenu()
entry = (id > 0) ? s_mostEntries->at( --id ) : 0L;
}
setEnabled( !s_mostEntries->isEmpty() );
Q_ASSERT( s_mostEntries->count() == m_popupList.count() );
Q_ASSERT( (int)s_mostEntries->count() == m_popupList.count() );
}
#if 0
......
......@@ -25,7 +25,7 @@
#include <q3ptrlist.h>
class HistoryEntry;
class Q3PopupMenu;
class QMenu;
/**
* Plug this action into a menu to get a bidirectional history
......@@ -35,7 +35,7 @@ class KonqBidiHistoryAction : public KAction
{
Q_OBJECT
public:
KonqBidiHistoryAction( const QString & text, QObject* parent = 0, const char* name = 0 );
KonqBidiHistoryAction( const QString & text, KActionCollection* parent = 0, const char* name = 0 );
virtual ~KonqBidiHistoryAction() {};
......@@ -46,7 +46,7 @@ public:
// Used by KonqHistoryAction and KonqBidiHistoryAction
static void fillHistoryPopup( const Q3PtrList<HistoryEntry> &history,
Q3PopupMenu * popup,
QMenu * popup,
bool onlyBack = false,
bool onlyForward = false,
bool checkCurrentItem = false,
......@@ -63,7 +63,7 @@ private:
uint m_firstIndex; // first index in the Go menu
int m_startPos;
int m_currentPos; // == history.at()
Q3PopupMenu *m_goMenu; // hack
QMenu *m_goMenu; // hack
};
/////
......@@ -72,16 +72,16 @@ class KonqLogoAction : public KAction
{
Q_OBJECT
public:
KonqLogoAction( const QString& text, int accel = 0, QObject* parent = 0, const char* name = 0 );
KonqLogoAction( const QString& text, int accel,
QObject* receiver, const char* slot, QObject* parent, const char* name = 0 );
KonqLogoAction( const QString& text, const QIcon& pix, int accel = 0,
QObject* parent = 0, const char* name = 0 );
KonqLogoAction( const QString& text, const QIcon& pix, int accel,
QObject* receiver, const char* slot, QObject* parent, const char* name = 0 );
KonqLogoAction( const QString& text, const KShortcut& accel = KShortcut(), KActionCollection* parent = 0, const char* name = 0 );
KonqLogoAction( const QString& text, const KShortcut& accel,
QObject* receiver, const char* slot, KActionCollection* parent, const char* name = 0 );
KonqLogoAction( const QString& text, const QIcon& pix, const KShortcut& accel = KShortcut(),
KActionCollection* parent = 0, const char* name = 0 );
KonqLogoAction( const QString& text, const QIcon& pix, const KShortcut& accel,
QObject* receiver, const char* slot, KActionCollection* parent, const char* name = 0 );
// text missing !
KonqLogoAction( const QStringList& icons, QObject* receiver,
const char* slot, QObject* parent, const char* name = 0 );
const char* slot, KActionCollection* parent, const char* name = 0 );
virtual int plug( QWidget *widget, int index = -1 );
virtual void updateIcon(int id);
......@@ -98,12 +98,12 @@ class KonqViewModeAction : public KRadioAction
Q_OBJECT
public:
KonqViewModeAction( const QString &text, const QString &icon,
QObject *parent, const char *name );
KActionCollection *parent, const char *name );
virtual ~KonqViewModeAction();
virtual int plug( QWidget *widget, int index = -1 );
Q3PopupMenu *popupMenu() const { return m_menu; }
QMenu *popupMenu() const { return m_menu; }
private slots:
void slotPopupAboutToShow();
......@@ -112,7 +112,7 @@ private slots:
private:
bool m_popupActivated;
Q3PopupMenu *m_menu;
QMenu *m_menu;
};
class MostOftenList : public KonqBaseHistoryList
......@@ -129,7 +129,7 @@ class KonqMostOftenURLSAction : public KActionMenu
Q_OBJECT
public:
KonqMostOftenURLSAction( const QString& text, QObject *parent,
KonqMostOftenURLSAction( const QString& text, KActionCollection *parent,
const char *name );
virtual ~KonqMostOftenURLSAction();
......
......@@ -2,8 +2,8 @@
#include "konq_browseriface.h"
#include "konq_view.h"
KonqBrowserInterface::KonqBrowserInterface( KonqView *view, const char *name )
: KParts::BrowserInterface( view, name )
KonqBrowserInterface::KonqBrowserInterface( KonqView *view )
: KParts::BrowserInterface( view )
{
m_view = view;
}
......
......@@ -10,7 +10,7 @@ class KonqBrowserInterface : public KParts::BrowserInterface
Q_OBJECT
Q_PROPERTY( uint historyLength READ historyLength )
public:
KonqBrowserInterface( KonqView *view, const char *name );
KonqBrowserInterface( KonqView *view );
uint historyLength() const;
......
......@@ -35,7 +35,6 @@
#include <klineedit.h>
#include <konq_pixmapprovider.h>
#include <kstdaccel.h>
#include <kurldrag.h>
#include <konq_mainwindow.h>
#include <kstringhandler.h>
......@@ -105,8 +104,8 @@ public:
};
#endif
KonqCombo::KonqCombo( QWidget *parent, const char *name )
: KHistoryCombo( parent, name ),
KonqCombo::KonqCombo( QWidget *parent )
: KHistoryCombo( parent ),
m_returnPressed( false ),
m_permanent( false ),
m_modifier( Qt::NoButton ),
......@@ -584,14 +583,14 @@ void KonqCombo::mouseMoveEvent( QMouseEvent *e )
KURL url ( currentText() );
if ( url.isValid() )
{
KURL::List list;
list.append( url );
KURLDrag *drag = new KURLDrag( list, this );
QDrag* drag = new QDrag(this);
QMimeData* mime = new QMimeData();
url.populateMimeData(mime);
QPixmap pix = KonqPixmapProvider::self()->pixmapFor( currentText(),
KIcon::SizeMedium );
if ( !pix.isNull() )
drag->setPixmap( pix );
drag->dragCopy();
drag->start();
}
}
}
......
......@@ -40,7 +40,7 @@ class KonqCombo : public KHistoryCombo
Q_OBJECT
public:
KonqCombo( QWidget *parent, const char *name );
KonqCombo( QWidget *parent );
~KonqCombo();
// initializes with the completion object and calls loadItems()
......
......@@ -24,6 +24,7 @@
#include <kconfig.h>
#include <kdebug.h>
#include <klocale.h>
#include <kinstance.h>
#include <kparts/componentfactory.h>
#include <kparts/plugin.h>
#include <kplugininfo.h>
......
......@@ -162,7 +162,7 @@ void KonqFrameStatusBar::splitFrameMenu()
// ###### might be not right for passive views !
KActionCollection *actionColl = mw->actionCollection();
Q3PopupMenu menu;
QMenu menu;
actionColl->action( "splitviewh" )->plug( &menu );
actionColl->action( "splitviewv" )->plug( &menu );
......
......@@ -194,7 +194,7 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
QString description = i18n( "Show %1" ).arg( (*cIt)->name() );
QString name = (*cIt)->desktopEntryName();
//kdDebug(1202) << "ToggleViewGUIClient: name=" << name << endl;
KToggleAction *action = new KToggleAction( description, 0, mainWindow->actionCollection(), name.latin1() );
KToggleAction *action = new KToggleAction( description, 0, mainWindow->actionCollection(), name.toLatin1() );
action->setCheckedState( i18n( "Hide %1" ).arg( (*cIt)->name() ) );
// HACK
......
This diff is collapsed.
......@@ -336,7 +336,7 @@ public slots:
void slotCtrlTabPressed();
// for KBookmarkMenu and KBookmarkBar
void slotFillContextMenu( const KBookmark &, Q3PopupMenu * );
void slotFillContextMenu( const KBookmark &, QMenu * );
void slotOpenBookmarkURL( const QString & url, Qt::ButtonState state );
void slotPopupMenu( const QPoint &_global, const KURL &_url, const QString &_mimeType, mode_t mode );
......@@ -382,14 +382,14 @@ public slots:
// Go menu
void slotUp();
void slotUp(KAction::ActivationReason, Qt::ButtonState state);
void slotUp(KAction::ActivationReason, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers);
void slotUpDelayed();
void slotBack();
void slotBack(KAction::ActivationReason, Qt::ButtonState state);
void slotBack(KAction::ActivationReason, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers);
void slotForward();
void slotForward(KAction::ActivationReason, Qt::ButtonState state);
void slotForward(KAction::ActivationReason, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers);
void slotHome();
void slotHome(KAction::ActivationReason, Qt::ButtonState state);
void slotHome(KAction::ActivationReason, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers);
void slotGoSystem();
void slotGoApplications();
void slotGoMedia();
......@@ -411,7 +411,7 @@ public slots:
void slotPartChanged( KonqView *childView, KParts::ReadOnlyPart *oldPart, KParts::ReadOnlyPart *newPart );
void slotRunFinished();
void slotClearLocationBar( KAction::ActivationReason reason, Qt::ButtonState state );
void slotClearLocationBar( KAction::ActivationReason reason, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers );
// reimplement from KParts::MainWindow
virtual void slotSetStatusBarText( const QString &text );
......@@ -421,7 +421,7 @@ public slots:
virtual void setIcon( const QPixmap& );
void slotGoHistoryActivated( int steps );
void slotGoHistoryActivated( int steps, Qt::ButtonState state );
void slotGoHistoryActivated( int steps, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers );
void slotAddTab();
......@@ -526,7 +526,7 @@ protected slots:
protected:
virtual bool eventFilter(QObject*obj,QEvent *ev);
void fillHistoryPopup( Q3PopupMenu *menu, const Q3PtrList<HistoryEntry> &history );
void fillHistoryPopup( QMenu *menu, const Q3PtrList<HistoryEntry> &history );
bool makeViewsFollow( const KURL & url, const KParts::URLArgs &args, const QString & serviceType,
KonqView * senderView );
......@@ -556,7 +556,7 @@ private slots:
void bookmarksIntoCompletion();
void initBookmarkBar();
void slotTrashActivated( KAction::ActivationReason reason, Qt::ButtonState state );
void slotTrashActivated( KAction::ActivationReason reason, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers );
void showPageSecurity();
......@@ -687,7 +687,8 @@ private:
uint m_bViewModeToggled:1;
int m_goBuffer;
Qt::ButtonState m_goState;
Qt::MouseButtons m_goMouseState;
Qt::KeyboardModifiers m_goKeyboardState;
MapViews m_mapViews;
......
......@@ -34,7 +34,6 @@
#include <kdebug.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kurldrag.h>
#include <kstringhandler.h>
#include "konq_frame.h"
......@@ -82,7 +81,7 @@ KonqFrameTabs::KonqFrameTabs(QWidget* parent, KonqFrameContainerBase* parentCont
connect( this, SIGNAL( currentChanged ( QWidget * ) ),
this, SLOT( slotCurrentChanged( QWidget* ) ) );
m_pPopupMenu = new Q3PopupMenu( this );
m_pPopupMenu = new QMenu( this );
m_pPopupMenu->insertItem( SmallIcon( "tab_new" ),
i18n("&New Tab"),
m_pViewManager->mainWindow(),
......@@ -100,7 +99,7 @@ KonqFrameTabs::KonqFrameTabs(QWidget* parent, KonqFrameContainerBase* parentCont
SLOT( slotReloadPopup() ),
m_pViewManager->mainWindow()->action("reload")->shortcut(), RELOAD_ID );
m_pPopupMenu->insertSeparator();
m_pSubPopupMenuTab = new Q3PopupMenu( this );
m_pSubPopupMenuTab = new QMenu( this );
m_pPopupMenu->insertItem( i18n("Other Tabs" ), m_pSubPopupMenuTab, OTHERTABS_ID );
connect( m_pSubPopupMenuTab, SIGNAL( activated ( int ) ),
this, SLOT( slotSubPopupMenuTabActivated( int ) ) );
......@@ -476,14 +475,13 @@ void KonqFrameTabs::slotMouseMiddleClick( QWidget *w )
void KonqFrameTabs::slotTestCanDecode(const QDragMoveEvent *e, bool &accept /* result */)
{
accept = K3URLDrag::canDecode( e );
accept = KURL::List::canDecode( e->mimeData() );
}
void KonqFrameTabs::slotReceivedDropEvent( QDropEvent *e )
{
KURL::List lstDragURLs;
bool ok = K3URLDrag::decode( e, lstDragURLs );
if ( ok && lstDragURLs.first().isValid() ) {
KURL::List lstDragURLs = KURL::List::fromMimeData( e->mimeData() );
if ( lstDragURLs.count() ) {
KonqView* newView = m_pViewManager->addTab(QString::null, QString::null, false, false);
if (newView == 0L) return;
m_pViewManager->mainWindow()->openURL( newView, lstDragURLs.first(), QString::null );
......@@ -494,10 +492,9 @@ void KonqFrameTabs::slotReceivedDropEvent( QDropEvent *e )
void KonqFrameTabs::slotReceivedDropEvent( QWidget *w, QDropEvent *e )
{
KURL::List lstDragURLs;
bool ok = K3URLDrag::decode( e, lstDragURLs );
KURL::List lstDragURLs = KURL::List::fromMimeData( e->mimeData() );
KonqFrameBase* frame = dynamic_cast<KonqFrameBase*>(w);
if ( ok && lstDragURLs.first().isValid() && frame ) {
if ( lstDragURLs.count() && frame ) {
KURL lstDragURL = lstDragURLs.first();
if ( lstDragURL != frame->activeChildView()->url() )
m_pViewManager->mainWindow()->openURL( frame->activeChildView(), lstDragURL );
......@@ -508,11 +505,11 @@ void KonqFrameTabs::slotInitiateDrag( QWidget *w )
{
KonqFrameBase* frame = dynamic_cast<KonqFrameBase*>( w );
if (frame) {
KURL::List lst;
lst.append( frame->activeChildView()->url() );
K3URLDrag *d = new K3URLDrag( lst, this );
d->setPixmap( KMimeType::pixmapForURL( lst.first(), 0, KIcon::Small ) );
d->dragCopy();
QDrag *d = new QDrag( this );
QMimeData* md = new QMimeData();
frame->activeChildView()->url().populateMimeData(md);
d->setPixmap( KMimeType::pixmapForURL( frame->activeChildView()->url(), 0, KIcon::Small ) );
d->start();
}
}
......
......@@ -33,7 +33,7 @@
#include <Q3PtrList>
class QPixmap;
class Q3PopupMenu;
class QMenu;
class QToolButton;
class KonqView;
......@@ -123,8 +123,8 @@ private slots:
private:
KonqViewManager* m_pViewManager;
Q3PopupMenu* m_pPopupMenu;
Q3PopupMenu* m_pSubPopupMenuTab;
QMenu* m_pPopupMenu;
QMenu* m_pSubPopupMenuTab;
QToolButton* m_rightWidget;
QToolButton* m_leftWidget;
bool m_permanentCloseButtons;
......
......@@ -105,7 +105,7 @@ KonqView::KonqView( KonqViewFactory &viewFactory,
m_bDisableScrolling = false;
m_bGotIconURL = false;
m_bPopupMenuEnabled = true;
m_browserIface = new KonqBrowserInterface( this, "browseriface" );
m_browserIface = new KonqBrowserInterface( this );
m_bBackRightClick = KonqSettings::backRightClick();
m_bFollowActive = false;
m_bBuiltinView = false;
......
......@@ -167,7 +167,7 @@ KRemoteEncodingPlugin::slotAboutToShow()
void
KRemoteEncodingPlugin::slotItemSelected(int id)
{
KConfig config(("kio_" + m_currentURL.protocol() + "rc").latin1());
KConfig config(("kio_" + m_currentURL.protocol() + "rc").toLatin1());
QString host = m_currentURL.host();
if (!m_menu->popupMenu()->isItemChecked(id))
......@@ -188,7 +188,7 @@ KRemoteEncodingPlugin::slotDefault()
{
// We have no choice but delete all higher domain level
// settings here since it affects what will be matched.
KConfig config(("kio_" + m_currentURL.protocol() + "rc").latin1());
KConfig config(("kio_" + m_currentURL.protocol() + "rc").toLatin1());
QStringList partList = QStringList::split('.', m_currentURL.host(), false);
if (!partList.isEmpty())
......
......@@ -413,11 +413,11 @@ QString KURISearchFilterEngine::formatResult( const QString& url,
if (cseta.isEmpty())
cseta = "iso-8859-1";
QTextCodec *csetacodec = QTextCodec::codecForName(cseta.latin1());
QTextCodec *csetacodec = QTextCodec::codecForName(cseta.toLatin1());
if (!csetacodec)
{
cseta = "iso-8859-1";
csetacodec = QTextCodec::codecForName(cseta.latin1());
csetacodec = QTextCodec::codecForName(cseta.toLatin1());
}
// Decode user query:
......
......@@ -110,9 +110,9 @@ void SMBRoOptions::load()
QChar qc1 = scrambled[i*3];
QChar qc2 = scrambled[i*3+1];
QChar qc3 = scrambled[i*3+2];
unsigned int a1 = qc1.latin1() - '0';
unsigned int a2 = qc2.latin1() - 'A';
unsigned int a3 = qc3.latin1() - '0';
unsigned int a1 = qc1.toLatin1() - '0';
unsigned int a2 = qc2.toLatin1() - 'A';
unsigned int a3 = qc3.toLatin1() - '0';
unsigned int num = ((a1 & 0x3F) << 10) | ((a2& 0x1F) << 5) | (a3 & 0x1F);
password[i] = QChar((uchar)((num - 17) ^ 173)); // restore
}
......
......@@ -48,7 +48,7 @@
#include "sidebar_widget.moc"
addBackEnd::addBackEnd(QWidget *parent,class Q3PopupMenu *addmenu,bool universal,const QString &currentProfile, const char *name)
addBackEnd::addBackEnd(QWidget *parent,class QMenu *addmenu,bool universal,const QString &currentProfile, const char *name)
: QObject(parent,name),
m_parent(parent)
{
......@@ -268,8 +268,8 @@ Sidebar_Widget::Sidebar_Widget(QWidget *parent, KParts::ReadOnlyPart *par, const
m_buttonBar = new KMultiTabBar(KMultiTabBar::Vertical,this);
m_buttonBar->showActiveTabTexts(true);
m_menu = new Q3PopupMenu(this, "Sidebar_Widget::Menu");
Q3PopupMenu *addMenu = new Q3PopupMenu(this, "Sidebar_Widget::addPopup");
m_menu = new QMenu(this, "Sidebar_Widget::Menu");
QMenu *addMenu = new QMenu(this, "Sidebar_Widget::addPopup");
m_menu->insertItem(i18n("Add New"), addMenu, 0);
m_menu->insertSeparator();
m_menu->insertItem(i18n("Multiple Views"), 1);
......
......@@ -74,7 +74,7 @@ class addBackEnd: public QObject
{
Q_OBJECT
public:
addBackEnd(QWidget *parent,class Q3PopupMenu *addmenu, bool univeral, const QString &currentProfile, const char *name=0);
addBackEnd(QWidget *parent,class QMenu *addmenu, bool univeral, const QString &currentProfile, const char *name=0);
~addBackEnd(){;}
protected slots:
void aboutToShowAddMenu();
......@@ -83,7 +83,7 @@ signals:
void updateNeeded();