author | drw <drw> | 2005-06-15 19:23:41 (UTC) |
---|---|---|
committer | drw <drw> | 2005-06-15 19:23:41 (UTC) |
commit | dfad70bb3964d6f7142660ea4349d4af0349b46d (patch) (unidiff) | |
tree | fef2e7f560c9453465159bf5b385b97d658c156e | |
parent | 1919f131d887881b52998bf1bad3ffda058d381c (diff) | |
download | opie-dfad70bb3964d6f7142660ea4349d4af0349b46d.zip opie-dfad70bb3964d6f7142660ea4349d4af0349b46d.tar.gz opie-dfad70bb3964d6f7142660ea4349d4af0349b46d.tar.bz2 |
Resource -> OResource
-rw-r--r-- | noncore/net/linphone/mainwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/net/linphone/mainwindow.cpp b/noncore/net/linphone/mainwindow.cpp index 1bd9987..5b9b867 100644 --- a/noncore/net/linphone/mainwindow.cpp +++ b/noncore/net/linphone/mainwindow.cpp | |||
@@ -1,37 +1,37 @@ | |||
1 | #include <qlayout.h> | 1 | #include <qlayout.h> |
2 | #include <qpe/resource.h> | 2 | #include <opie2/oresource.h> |
3 | #include <qpe/qpeapplication.h> | 3 | #include <qpe/qpeapplication.h> |
4 | 4 | ||
5 | #include "mainwindow.h" | 5 | #include "mainwindow.h" |
6 | #include "linphoneconfig.h" | 6 | #include "linphoneconfig.h" |
7 | 7 | ||
8 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | 8 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) |
9 | : QMainWindow( parent, name, flags ) { | 9 | : QMainWindow( parent, name, flags ) { |
10 | 10 | ||
11 | setCaption( tr( "Sip Phone" ) ); | 11 | setCaption( tr( "Sip Phone" ) ); |
12 | setToolBarsMovable( false ); | 12 | setToolBarsMovable( false ); |
13 | 13 | ||
14 | toolBar = new QToolBar( this ); | 14 | toolBar = new QToolBar( this ); |
15 | toolBar->setHorizontalStretchable( true ); | 15 | toolBar->setHorizontalStretchable( true ); |
16 | menuBar = new QMenuBar( toolBar ); | 16 | menuBar = new QMenuBar( toolBar ); |
17 | prefMenu = new QPopupMenu( menuBar ); | 17 | prefMenu = new QPopupMenu( menuBar ); |
18 | menuBar->insertItem( tr( "Connection" ), prefMenu ); | 18 | menuBar->insertItem( tr( "Connection" ), prefMenu ); |
19 | 19 | ||
20 | settings = new QAction( tr("Settings"), QIconSet( Resource::loadPixmap("SettingsIcon") ), 0, 0, this); | 20 | settings = new QAction( tr("Settings"), Opie::Core::OResource::loadPixmap("SettingsIcon", Opie::Core::OResource::SmallIcon) ), 0, 0, this); |
21 | settings->addTo( prefMenu ); | 21 | settings->addTo( prefMenu ); |
22 | connect( settings, SIGNAL( activated() ), | 22 | connect( settings, SIGNAL( activated() ), |
23 | SLOT( slotSettings() ) ); | 23 | SLOT( slotSettings() ) ); |
24 | 24 | ||
25 | mainWidget = new QLinphoneMainWidget( this, "qlinphone", WStyle_ContextHelp ); | 25 | mainWidget = new QLinphoneMainWidget( this, "qlinphone", WStyle_ContextHelp ); |
26 | setCentralWidget( mainWidget ); | 26 | setCentralWidget( mainWidget ); |
27 | } | 27 | } |
28 | 28 | ||
29 | 29 | ||
30 | MainWindow::~MainWindow() {} | 30 | MainWindow::~MainWindow() {} |
31 | 31 | ||
32 | void MainWindow::slotSettings() { | 32 | void MainWindow::slotSettings() { |
33 | LinPhoneConfig settings( this, 0, true, WStyle_ContextHelp ); | 33 | LinPhoneConfig settings( this, 0, true, WStyle_ContextHelp ); |
34 | QPEApplication::execDialog( &settings ); | 34 | QPEApplication::execDialog( &settings ); |
35 | // FIXME - only in OK case | 35 | // FIXME - only in OK case |
36 | mainWidget->createLinphoneCore(); | 36 | mainWidget->createLinphoneCore(); |
37 | } | 37 | } |