-rw-r--r-- | libopie/big-screen/example/osplitter_mail.cpp | 4 | ||||
-rw-r--r-- | libopie/colordialog.cpp | 8 | ||||
-rw-r--r-- | libopie/colorpopupmenu.cpp | 2 | ||||
-rw-r--r-- | libopie/ocolorbutton.cpp | 2 | ||||
-rw-r--r-- | libopie/odevice.cpp | 16 | ||||
-rw-r--r-- | libopie/ofileselector.cpp | 14 | ||||
-rw-r--r-- | libopie/ofontselector.cpp | 8 | ||||
-rw-r--r-- | libopie/orecurrancewidget.cpp | 4 | ||||
-rw-r--r-- | libopie/otabwidget.cpp | 4 | ||||
-rw-r--r-- | libopie/otimepicker.cpp | 12 | ||||
-rw-r--r-- | libopie/pim/ocontactaccess.cpp | 13 | ||||
-rw-r--r-- | libopie/pim/opimmainwindow.cpp | 8 |
12 files changed, 50 insertions, 45 deletions
diff --git a/libopie/big-screen/example/osplitter_mail.cpp b/libopie/big-screen/example/osplitter_mail.cpp index 4eaf3a9..4356baa 100644 --- a/libopie/big-screen/example/osplitter_mail.cpp +++ b/libopie/big-screen/example/osplitter_mail.cpp | |||
@@ -19,26 +19,26 @@ class Folder { | |||
19 | }; | 19 | }; |
20 | 20 | ||
21 | // ----------------------------------------------------------------- | 21 | // ----------------------------------------------------------------- |
22 | 22 | ||
23 | ListViews::ListViews( QWidget* p, const char* name, WFlags fl ) | 23 | ListViews::ListViews( QWidget* p, const char* name, WFlags fl ) |
24 | : QWidget( p, name, fl ) { | 24 | : QWidget( p, name, fl ) { |
25 | qApp->installEventFilter( this ); | 25 | qApp->installEventFilter( this ); |
26 | m_lstFolders.setAutoDelete( true ); | 26 | m_lstFolders.setAutoDelete( true ); |
27 | QHBoxLayout *lay = new QHBoxLayout(this); | 27 | QHBoxLayout *lay = new QHBoxLayout(this); |
28 | 28 | ||
29 | m_splitter = new OSplitter( Horizontal, this, "SPlitter 1" ); | 29 | m_splitter = new OSplitter( Horizontal, this, "SPlitter 1" ); |
30 | lay->addWidget( m_splitter ); | 30 | lay->addWidget( m_splitter ); |
31 | connect(m_splitter, SIGNAL(sizeChange(bool, const QSize& ) ), | 31 | connect(m_splitter, SIGNAL(sizeChange(bool,const QSize&) ), |
32 | this, SLOT(slotSizeChange(bool, const QSize& ) ) ); | 32 | this, SLOT(slotSizeChange(bool,const QSize&) ) ); |
33 | 33 | ||
34 | m_overview = new QListView( m_splitter ); | 34 | m_overview = new QListView( m_splitter ); |
35 | m_overview->header()->setClickEnabled( FALSE ); | 35 | m_overview->header()->setClickEnabled( FALSE ); |
36 | m_overview->addColumn( tr("Folder") ); | 36 | m_overview->addColumn( tr("Folder") ); |
37 | m_overview->setMaximumWidth( 200 ); | 37 | m_overview->setMaximumWidth( 200 ); |
38 | m_splitter->addWidget( m_overview, "zoom", tr("Folder Overview") ); | 38 | m_splitter->addWidget( m_overview, "zoom", tr("Folder Overview") ); |
39 | m_splitter->setSizeChange( 300 ); | 39 | m_splitter->setSizeChange( 300 ); |
40 | 40 | ||
41 | /* OSplitter starts with the small mode */ | 41 | /* OSplitter starts with the small mode */ |
42 | m_messages = 0; | 42 | m_messages = 0; |
43 | m_message = m_attach = 0; | 43 | m_message = m_attach = 0; |
44 | 44 | ||
diff --git a/libopie/colordialog.cpp b/libopie/colordialog.cpp index d46da41..b2854a6 100644 --- a/libopie/colordialog.cpp +++ b/libopie/colordialog.cpp | |||
@@ -463,28 +463,28 @@ void QColorShowLabel::mouseReleaseEvent( QMouseEvent * ) | |||
463 | QColorShower::QColorShower( QWidget *parent, const char *name ) | 463 | QColorShower::QColorShower( QWidget *parent, const char *name ) |
464 | :QWidget( parent, name) | 464 | :QWidget( parent, name) |
465 | { | 465 | { |
466 | curCol = qRgb( -1, -1, -1 ); | 466 | curCol = qRgb( -1, -1, -1 ); |
467 | QColIntValidator *val256 = new QColIntValidator( 0, 255, this ); | 467 | QColIntValidator *val256 = new QColIntValidator( 0, 255, this ); |
468 | QColIntValidator *val360 = new QColIntValidator( 0, 360, this ); | 468 | QColIntValidator *val360 = new QColIntValidator( 0, 360, this ); |
469 | 469 | ||
470 | QGridLayout *gl = new QGridLayout( this, 1, 1, 2 ); | 470 | QGridLayout *gl = new QGridLayout( this, 1, 1, 2 ); |
471 | gl->setMargin( 0 ); | 471 | gl->setMargin( 0 ); |
472 | lab = new QColorShowLabel( this ); | 472 | lab = new QColorShowLabel( this ); |
473 | lab->setMinimumWidth( 60 ); //### | 473 | lab->setMinimumWidth( 60 ); //### |
474 | gl->addMultiCellWidget(lab, 0,-1,0,0); | 474 | gl->addMultiCellWidget(lab, 0,-1,0,0); |
475 | connect( lab, SIGNAL( colorDropped( QRgb ) ), | 475 | connect( lab, SIGNAL( colorDropped(QRgb) ), |
476 | this, SIGNAL( newCol( QRgb ) ) ); | 476 | this, SIGNAL( newCol(QRgb) ) ); |
477 | connect( lab, SIGNAL( colorDropped( QRgb ) ), | 477 | connect( lab, SIGNAL( colorDropped(QRgb) ), |
478 | this, SLOT( setRgb( QRgb ) ) ); | 478 | this, SLOT( setRgb(QRgb) ) ); |
479 | 479 | ||
480 | hEd = new QColNumLineEdit( this ); | 480 | hEd = new QColNumLineEdit( this ); |
481 | hEd->setValidator( val360 ); | 481 | hEd->setValidator( val360 ); |
482 | QLabel *l = new QLabel( hEd, OColorDialog::tr("Hue:"), this ); | 482 | QLabel *l = new QLabel( hEd, OColorDialog::tr("Hue:"), this ); |
483 | l->setAlignment( AlignRight|AlignVCenter ); | 483 | l->setAlignment( AlignRight|AlignVCenter ); |
484 | gl->addWidget( l, 0, 1 ); | 484 | gl->addWidget( l, 0, 1 ); |
485 | gl->addWidget( hEd, 0, 2 ); | 485 | gl->addWidget( hEd, 0, 2 ); |
486 | 486 | ||
487 | sEd = new QColNumLineEdit( this ); | 487 | sEd = new QColNumLineEdit( this ); |
488 | sEd->setValidator( val256 ); | 488 | sEd->setValidator( val256 ); |
489 | l = new QLabel( sEd, OColorDialog::tr("Sat:"), this ); | 489 | l = new QLabel( sEd, OColorDialog::tr("Sat:"), this ); |
490 | l->setAlignment( AlignRight|AlignVCenter ); | 490 | l->setAlignment( AlignRight|AlignVCenter ); |
diff --git a/libopie/colorpopupmenu.cpp b/libopie/colorpopupmenu.cpp index 0d66fba..03ad233 100644 --- a/libopie/colorpopupmenu.cpp +++ b/libopie/colorpopupmenu.cpp | |||
@@ -143,25 +143,25 @@ OColorPopupMenu::OColorPopupMenu( const QColor& color, QWidget* parent, const ch | |||
143 | chooseColorAction->addTo( this ); | 143 | chooseColorAction->addTo( this ); |
144 | */ | 144 | */ |
145 | activateItemAt( 0 ); | 145 | activateItemAt( 0 ); |
146 | } | 146 | } |
147 | 147 | ||
148 | OColorPopupMenu::~OColorPopupMenu() | 148 | OColorPopupMenu::~OColorPopupMenu() |
149 | { | 149 | { |
150 | } | 150 | } |
151 | 151 | ||
152 | void OColorPopupMenu::addColor( const QColor& color, int row, int col ) | 152 | void OColorPopupMenu::addColor( const QColor& color, int row, int col ) |
153 | { | 153 | { |
154 | OColorPanelButton* panelButton = new OColorPanelButton( color, colorPanel ); | 154 | OColorPanelButton* panelButton = new OColorPanelButton( color, colorPanel ); |
155 | connect( panelButton, SIGNAL( selected( const QColor& ) ), this, SLOT( buttonSelected( const QColor& ) ) ); | 155 | connect( panelButton, SIGNAL( selected(const QColor&) ), this, SLOT( buttonSelected(const QColor&) ) ); |
156 | colorLayout->addWidget( panelButton, row, col ); | 156 | colorLayout->addWidget( panelButton, row, col ); |
157 | } | 157 | } |
158 | 158 | ||
159 | void OColorPopupMenu::buttonSelected( const QColor& color ) | 159 | void OColorPopupMenu::buttonSelected( const QColor& color ) |
160 | { | 160 | { |
161 | m_color = color; | 161 | m_color = color; |
162 | emit colorSelected( color ); | 162 | emit colorSelected( color ); |
163 | hide(); | 163 | hide(); |
164 | } | 164 | } |
165 | 165 | ||
166 | void OColorPopupMenu::moreColorClicked() | 166 | void OColorPopupMenu::moreColorClicked() |
167 | { | 167 | { |
diff --git a/libopie/ocolorbutton.cpp b/libopie/ocolorbutton.cpp index 93fe5d0..298dba2 100644 --- a/libopie/ocolorbutton.cpp +++ b/libopie/ocolorbutton.cpp | |||
@@ -44,25 +44,25 @@ struct OColorButtonPrivate { | |||
44 | * @param parent The parent of the Color Button | 44 | * @param parent The parent of the Color Button |
45 | * @param color The color from where to start on | 45 | * @param color The color from where to start on |
46 | * @param name @see QObject | 46 | * @param name @see QObject |
47 | */ | 47 | */ |
48 | OColorButton::OColorButton ( QWidget *parent, const QColor &color, const char *name ) | 48 | OColorButton::OColorButton ( QWidget *parent, const QColor &color, const char *name ) |
49 | : QPushButton ( parent, name ) | 49 | : QPushButton ( parent, name ) |
50 | { | 50 | { |
51 | d = new OColorButtonPrivate; | 51 | d = new OColorButtonPrivate; |
52 | 52 | ||
53 | d-> m_menu = new OColorPopupMenu ( color, 0, 0 ); | 53 | d-> m_menu = new OColorPopupMenu ( color, 0, 0 ); |
54 | setPopup ( d-> m_menu ); | 54 | setPopup ( d-> m_menu ); |
55 | //setPopupDelay ( 0 ); | 55 | //setPopupDelay ( 0 ); |
56 | connect ( d-> m_menu, SIGNAL( colorSelected ( const QColor & )), this, SLOT( updateColor ( const QColor & ))); | 56 | connect ( d-> m_menu, SIGNAL( colorSelected(const QColor&)), this, SLOT( updateColor(const QColor&))); |
57 | 57 | ||
58 | updateColor ( color ); | 58 | updateColor ( color ); |
59 | 59 | ||
60 | QSize s = sizeHint ( ) + QSize ( 12, 0 ); | 60 | QSize s = sizeHint ( ) + QSize ( 12, 0 ); |
61 | setMinimumSize ( s ); | 61 | setMinimumSize ( s ); |
62 | setMaximumSize ( s. width ( ) * 2, s. height ( )); | 62 | setMaximumSize ( s. width ( ) * 2, s. height ( )); |
63 | } | 63 | } |
64 | 64 | ||
65 | /** | 65 | /** |
66 | * This destructs the object | 66 | * This destructs the object |
67 | */ | 67 | */ |
68 | OColorButton::~OColorButton ( ) | 68 | OColorButton::~OColorButton ( ) |
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp index c0b6efa..4258d60 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp | |||
@@ -523,25 +523,25 @@ void ODevice::initButtons ( ) | |||
523 | if (( ib-> model & Model_iPAQ_H36xx ) == Model_iPAQ_H36xx ) { | 523 | if (( ib-> model & Model_iPAQ_H36xx ) == Model_iPAQ_H36xx ) { |
524 | b. setKeycode ( ib-> code ); | 524 | b. setKeycode ( ib-> code ); |
525 | b. setUserText ( QObject::tr ( "Button", ib-> utext )); | 525 | b. setUserText ( QObject::tr ( "Button", ib-> utext )); |
526 | b. setPixmap ( Resource::loadPixmap ( ib-> pix )); | 526 | b. setPixmap ( Resource::loadPixmap ( ib-> pix )); |
527 | b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib-> fpressedservice ), ib-> fpressedaction )); | 527 | b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib-> fpressedservice ), ib-> fpressedaction )); |
528 | b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib-> fheldservice ), ib-> fheldaction )); | 528 | b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib-> fheldservice ), ib-> fheldaction )); |
529 | d-> m_buttons-> append ( b ); | 529 | d-> m_buttons-> append ( b ); |
530 | } | 530 | } |
531 | } | 531 | } |
532 | reloadButtonMapping ( ); | 532 | reloadButtonMapping ( ); |
533 | 533 | ||
534 | QCopChannel *sysch = new QCopChannel ( "QPE/System", this ); | 534 | QCopChannel *sysch = new QCopChannel ( "QPE/System", this ); |
535 | connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), this, SLOT( systemMessage ( const QCString &, const QByteArray & ))); | 535 | connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&))); |
536 | } | 536 | } |
537 | 537 | ||
538 | ODevice::~ODevice ( ) | 538 | ODevice::~ODevice ( ) |
539 | { | 539 | { |
540 | // we leak m_devicebuttons and m_cpu_frequency | 540 | // we leak m_devicebuttons and m_cpu_frequency |
541 | // but it's a singleton and it is not so importantant | 541 | // but it's a singleton and it is not so importantant |
542 | // -zecke | 542 | // -zecke |
543 | delete d; | 543 | delete d; |
544 | } | 544 | } |
545 | 545 | ||
546 | bool ODevice::setSoftSuspend ( bool /*soft*/ ) | 546 | bool ODevice::setSoftSuspend ( bool /*soft*/ ) |
547 | { | 547 | { |
@@ -1103,26 +1103,26 @@ void Yopy::initButtons ( ) | |||
1103 | b. setUserText ( QObject::tr ( "Button", ib-> utext )); | 1103 | b. setUserText ( QObject::tr ( "Button", ib-> utext )); |
1104 | b. setPixmap ( Resource::loadPixmap ( ib-> pix )); | 1104 | b. setPixmap ( Resource::loadPixmap ( ib-> pix )); |
1105 | b. setFactoryPresetPressedAction | 1105 | b. setFactoryPresetPressedAction |
1106 | (OQCopMessage(makeChannel(ib->fpressedservice), ib->fpressedaction)); | 1106 | (OQCopMessage(makeChannel(ib->fpressedservice), ib->fpressedaction)); |
1107 | b. setFactoryPresetHeldAction | 1107 | b. setFactoryPresetHeldAction |
1108 | (OQCopMessage(makeChannel(ib->fheldservice), ib->fheldaction)); | 1108 | (OQCopMessage(makeChannel(ib->fheldservice), ib->fheldaction)); |
1109 | 1109 | ||
1110 | d-> m_buttons-> append ( b ); | 1110 | d-> m_buttons-> append ( b ); |
1111 | } | 1111 | } |
1112 | reloadButtonMapping ( ); | 1112 | reloadButtonMapping ( ); |
1113 | 1113 | ||
1114 | QCopChannel *sysch = new QCopChannel("QPE/System", this); | 1114 | QCopChannel *sysch = new QCopChannel("QPE/System", this); |
1115 | connect(sysch, SIGNAL(received(const QCString &, const QByteArray & )), | 1115 | connect(sysch, SIGNAL(received(const QCString&,const QByteArray&)), |
1116 | this, SLOT(systemMessage(const QCString &, const QByteArray & ))); | 1116 | this, SLOT(systemMessage(const QCString&,const QByteArray&))); |
1117 | } | 1117 | } |
1118 | 1118 | ||
1119 | bool Yopy::suspend() | 1119 | bool Yopy::suspend() |
1120 | { | 1120 | { |
1121 | /* Opie for Yopy does not implement its own power management at the | 1121 | /* Opie for Yopy does not implement its own power management at the |
1122 | moment. The public version runs parallel to X, and relies on the | 1122 | moment. The public version runs parallel to X, and relies on the |
1123 | existing power management features. */ | 1123 | existing power management features. */ |
1124 | return false; | 1124 | return false; |
1125 | } | 1125 | } |
1126 | 1126 | ||
1127 | bool Yopy::setDisplayBrightness(int bright) | 1127 | bool Yopy::setDisplayBrightness(int bright) |
1128 | { | 1128 | { |
@@ -1252,25 +1252,25 @@ void iPAQ::initButtons ( ) | |||
1252 | b. setKeycode ( ib-> code ); | 1252 | b. setKeycode ( ib-> code ); |
1253 | b. setUserText ( QObject::tr ( "Button", ib-> utext )); | 1253 | b. setUserText ( QObject::tr ( "Button", ib-> utext )); |
1254 | b. setPixmap ( Resource::loadPixmap ( ib-> pix )); | 1254 | b. setPixmap ( Resource::loadPixmap ( ib-> pix )); |
1255 | b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib-> fpressedservice ), ib-> fpressedaction )); | 1255 | b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib-> fpressedservice ), ib-> fpressedaction )); |
1256 | b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib-> fheldservice ), ib-> fheldaction )); | 1256 | b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib-> fheldservice ), ib-> fheldaction )); |
1257 | 1257 | ||
1258 | d-> m_buttons-> append ( b ); | 1258 | d-> m_buttons-> append ( b ); |
1259 | } | 1259 | } |
1260 | } | 1260 | } |
1261 | reloadButtonMapping ( ); | 1261 | reloadButtonMapping ( ); |
1262 | 1262 | ||
1263 | QCopChannel *sysch = new QCopChannel ( "QPE/System", this ); | 1263 | QCopChannel *sysch = new QCopChannel ( "QPE/System", this ); |
1264 | connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), this, SLOT( systemMessage ( const QCString &, const QByteArray & ))); | 1264 | connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&))); |
1265 | } | 1265 | } |
1266 | 1266 | ||
1267 | 1267 | ||
1268 | //#include <linux/h3600_ts.h> // including kernel headers is evil ... | 1268 | //#include <linux/h3600_ts.h> // including kernel headers is evil ... |
1269 | 1269 | ||
1270 | typedef struct { | 1270 | typedef struct { |
1271 | unsigned char OffOnBlink; /* 0=off 1=on 2=Blink */ | 1271 | unsigned char OffOnBlink; /* 0=off 1=on 2=Blink */ |
1272 | unsigned char TotalTime; /* Units of 5 seconds */ | 1272 | unsigned char TotalTime; /* Units of 5 seconds */ |
1273 | unsigned char OnTime; /* units of 100m/s */ | 1273 | unsigned char OnTime; /* units of 100m/s */ |
1274 | unsigned char OffTime; /* units of 100m/s */ | 1274 | unsigned char OffTime; /* units of 100m/s */ |
1275 | } LED_IN; | 1275 | } LED_IN; |
1276 | 1276 | ||
@@ -1738,26 +1738,26 @@ void Zaurus::initButtons ( ) | |||
1738 | b. setPixmap ( Resource::loadPixmap ( zb-> pix )); | 1738 | b. setPixmap ( Resource::loadPixmap ( zb-> pix )); |
1739 | b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( zb-> fpressedservice ), | 1739 | b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( zb-> fpressedservice ), |
1740 | zb-> fpressedaction )); | 1740 | zb-> fpressedaction )); |
1741 | b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( zb-> fheldservice ), | 1741 | b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( zb-> fheldservice ), |
1742 | zb-> fheldaction )); | 1742 | zb-> fheldaction )); |
1743 | 1743 | ||
1744 | d-> m_buttons-> append ( b ); | 1744 | d-> m_buttons-> append ( b ); |
1745 | } | 1745 | } |
1746 | 1746 | ||
1747 | reloadButtonMapping ( ); | 1747 | reloadButtonMapping ( ); |
1748 | 1748 | ||
1749 | QCopChannel *sysch = new QCopChannel ( "QPE/System", this ); | 1749 | QCopChannel *sysch = new QCopChannel ( "QPE/System", this ); |
1750 | connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), | 1750 | connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), |
1751 | this, SLOT( systemMessage ( const QCString &, const QByteArray & ))); | 1751 | this, SLOT( systemMessage(const QCString&,const QByteArray&))); |
1752 | } | 1752 | } |
1753 | 1753 | ||
1754 | #include <unistd.h> | 1754 | #include <unistd.h> |
1755 | #include <fcntl.h> | 1755 | #include <fcntl.h> |
1756 | #include <sys/ioctl.h> | 1756 | #include <sys/ioctl.h> |
1757 | 1757 | ||
1758 | //#include <asm/sharp_char.h> // including kernel headers is evil ... | 1758 | //#include <asm/sharp_char.h> // including kernel headers is evil ... |
1759 | 1759 | ||
1760 | #define SHARP_DEV_IOCTL_COMMAND_START 0x5680 | 1760 | #define SHARP_DEV_IOCTL_COMMAND_START 0x5680 |
1761 | 1761 | ||
1762 | #defineSHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START) | 1762 | #defineSHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START) |
1763 | #define SHARP_BUZZER_MAKESOUND (SHARP_BUZZER_IOCTL_START) | 1763 | #define SHARP_BUZZER_MAKESOUND (SHARP_BUZZER_IOCTL_START) |
@@ -2289,25 +2289,25 @@ void SIMpad::initButtons ( ) | |||
2289 | b. setKeycode ( sb-> code ); | 2289 | b. setKeycode ( sb-> code ); |
2290 | b. setUserText ( QObject::tr ( "Button", sb-> utext )); | 2290 | b. setUserText ( QObject::tr ( "Button", sb-> utext )); |
2291 | b. setPixmap ( Resource::loadPixmap ( sb-> pix )); | 2291 | b. setPixmap ( Resource::loadPixmap ( sb-> pix )); |
2292 | b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( sb-> fpressedservice ), sb-> fpressedaction )); | 2292 | b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( sb-> fpressedservice ), sb-> fpressedaction )); |
2293 | b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( sb-> fheldservice ), sb-> fheldaction )); | 2293 | b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( sb-> fheldservice ), sb-> fheldaction )); |
2294 | 2294 | ||
2295 | d-> m_buttons-> append ( b ); | 2295 | d-> m_buttons-> append ( b ); |
2296 | } | 2296 | } |
2297 | } | 2297 | } |
2298 | reloadButtonMapping ( ); | 2298 | reloadButtonMapping ( ); |
2299 | 2299 | ||
2300 | QCopChannel *sysch = new QCopChannel ( "QPE/System", this ); | 2300 | QCopChannel *sysch = new QCopChannel ( "QPE/System", this ); |
2301 | connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), this, SLOT( systemMessage ( const QCString &, const QByteArray & ))); | 2301 | connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&))); |
2302 | } | 2302 | } |
2303 | 2303 | ||
2304 | // SIMpad boardcontrol register CS3 | 2304 | // SIMpad boardcontrol register CS3 |
2305 | #define SIMPAD_BOARDCONTROL "/proc/cs3" | 2305 | #define SIMPAD_BOARDCONTROL "/proc/cs3" |
2306 | #define SIMPAD_VCC_5V_EN 0x0001 // For 5V PCMCIA | 2306 | #define SIMPAD_VCC_5V_EN 0x0001 // For 5V PCMCIA |
2307 | #define SIMPAD_VCC_3V_EN 0x0002 // FOR 3.3V PCMCIA | 2307 | #define SIMPAD_VCC_3V_EN 0x0002 // FOR 3.3V PCMCIA |
2308 | #define SIMPAD_EN1 0x0004 // This is only for EPROM's | 2308 | #define SIMPAD_EN1 0x0004 // This is only for EPROM's |
2309 | #define SIMPAD_EN0 0x0008 // Both should be enable for 3.3V or 5V | 2309 | #define SIMPAD_EN0 0x0008 // Both should be enable for 3.3V or 5V |
2310 | #define SIMPAD_DISPLAY_ON 0x0010 | 2310 | #define SIMPAD_DISPLAY_ON 0x0010 |
2311 | #define SIMPAD_PCMCIA_BUFF_DIS 0x0020 | 2311 | #define SIMPAD_PCMCIA_BUFF_DIS 0x0020 |
2312 | #define SIMPAD_MQ_RESET 0x0040 | 2312 | #define SIMPAD_MQ_RESET 0x0040 |
2313 | #define SIMPAD_PCMCIA_RESET 0x0080 | 2313 | #define SIMPAD_PCMCIA_RESET 0x0080 |
@@ -2789,25 +2789,25 @@ void Jornada::initButtons ( ) | |||
2789 | if (( ib-> model & Model_iPAQ_H36xx ) == Model_iPAQ_H36xx ) { | 2789 | if (( ib-> model & Model_iPAQ_H36xx ) == Model_iPAQ_H36xx ) { |
2790 | b. setKeycode ( ib-> code ); | 2790 | b. setKeycode ( ib-> code ); |
2791 | b. setUserText ( QObject::tr ( "Button", ib-> utext )); | 2791 | b. setUserText ( QObject::tr ( "Button", ib-> utext )); |
2792 | b. setPixmap ( Resource::loadPixmap ( ib-> pix )); | 2792 | b. setPixmap ( Resource::loadPixmap ( ib-> pix )); |
2793 | b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib-> fpressedservice ), ib-> fpressedaction )); | 2793 | b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib-> fpressedservice ), ib-> fpressedaction )); |
2794 | b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib-> fheldservice ), ib-> fheldaction )); | 2794 | b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib-> fheldservice ), ib-> fheldaction )); |
2795 | d-> m_buttons-> append ( b ); | 2795 | d-> m_buttons-> append ( b ); |
2796 | } | 2796 | } |
2797 | } | 2797 | } |
2798 | reloadButtonMapping ( ); | 2798 | reloadButtonMapping ( ); |
2799 | 2799 | ||
2800 | QCopChannel *sysch = new QCopChannel ( "QPE/System", this ); | 2800 | QCopChannel *sysch = new QCopChannel ( "QPE/System", this ); |
2801 | connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), this, SLOT( systemMessage ( const QCString &, const QByteArray & ))); | 2801 | connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&))); |
2802 | } | 2802 | } |
2803 | #endif | 2803 | #endif |
2804 | int Jornada::displayBrightnessResolution ( ) const | 2804 | int Jornada::displayBrightnessResolution ( ) const |
2805 | { | 2805 | { |
2806 | } | 2806 | } |
2807 | 2807 | ||
2808 | bool Jornada::setDisplayBrightness ( int bright ) | 2808 | bool Jornada::setDisplayBrightness ( int bright ) |
2809 | { | 2809 | { |
2810 | bool res = false; | 2810 | bool res = false; |
2811 | int fd; | 2811 | int fd; |
2812 | 2812 | ||
2813 | if ( bright > 255 ) | 2813 | if ( bright > 255 ) |
diff --git a/libopie/ofileselector.cpp b/libopie/ofileselector.cpp index 1ba94ae..2a6aed0 100644 --- a/libopie/ofileselector.cpp +++ b/libopie/ofileselector.cpp | |||
@@ -114,30 +114,30 @@ int ODocumentFileView::fileCount()const { | |||
114 | 114 | ||
115 | return m_selector->fileCount(); | 115 | return m_selector->fileCount(); |
116 | } | 116 | } |
117 | DocLnk ODocumentFileView::selectedDocument()const { | 117 | DocLnk ODocumentFileView::selectedDocument()const { |
118 | if (!m_selector) | 118 | if (!m_selector) |
119 | return DocLnk(); | 119 | return DocLnk(); |
120 | 120 | ||
121 | return m_selector->selectedDocument(); | 121 | return m_selector->selectedDocument(); |
122 | } | 122 | } |
123 | QWidget* ODocumentFileView::widget( QWidget* parent ) { | 123 | QWidget* ODocumentFileView::widget( QWidget* parent ) { |
124 | if (!m_selector ) { | 124 | if (!m_selector ) { |
125 | m_selector = new FileSelector(currentMimeType().join(";"), parent, "fileselector", showNew(), showClose() ); | 125 | m_selector = new FileSelector(currentMimeType().join(";"), parent, "fileselector", showNew(), showClose() ); |
126 | QObject::connect(m_selector, SIGNAL(fileSelected( const DocLnk& ) ), | 126 | QObject::connect(m_selector, SIGNAL(fileSelected(const DocLnk&) ), |
127 | selector(), SLOT(slotDocLnkBridge(const DocLnk&) ) ); | 127 | selector(), SLOT(slotDocLnkBridge(const DocLnk&) ) ); |
128 | QObject::connect(m_selector, SIGNAL(closeMe() ), | 128 | QObject::connect(m_selector, SIGNAL(closeMe() ), |
129 | selector(), SIGNAL(closeMe() ) ); | 129 | selector(), SIGNAL(closeMe() ) ); |
130 | QObject::connect(m_selector, SIGNAL(newSelected(const DocLnk& ) ), | 130 | QObject::connect(m_selector, SIGNAL(newSelected(const DocLnk&) ), |
131 | selector(), SIGNAL(newSelected(const DocLnk& ) ) ); | 131 | selector(), SIGNAL(newSelected(const DocLnk&) ) ); |
132 | } | 132 | } |
133 | 133 | ||
134 | return m_selector; | 134 | return m_selector; |
135 | } | 135 | } |
136 | 136 | ||
137 | /* | 137 | /* |
138 | * This is the file system view used | 138 | * This is the file system view used |
139 | * we use a QListView + QListViewItems for it | 139 | * we use a QListView + QListViewItems for it |
140 | */ | 140 | */ |
141 | 141 | ||
142 | OFileSelectorItem::OFileSelectorItem( QListView* view, const QPixmap& pixmap, | 142 | OFileSelectorItem::OFileSelectorItem( QListView* view, const QPixmap& pixmap, |
143 | const QString& path, const QString& date, | 143 | const QString& path, const QString& date, |
@@ -379,26 +379,26 @@ bool OFileViewFileListView::eventFilter (QObject *o, QEvent *e) { | |||
379 | if ( (k->key()==Key_Enter) || (k->key()==Key_Return)) { | 379 | if ( (k->key()==Key_Enter) || (k->key()==Key_Return)) { |
380 | slotClicked( Qt::LeftButton,m_view->currentItem(),QPoint(0,0),0); | 380 | slotClicked( Qt::LeftButton,m_view->currentItem(),QPoint(0,0),0); |
381 | return true; | 381 | return true; |
382 | } | 382 | } |
383 | } | 383 | } |
384 | return false; | 384 | return false; |
385 | } | 385 | } |
386 | 386 | ||
387 | 387 | ||
388 | void OFileViewFileListView::connectSlots() { | 388 | void OFileViewFileListView::connectSlots() { |
389 | connect(m_view, SIGNAL(clicked(QListViewItem*) ), | 389 | connect(m_view, SIGNAL(clicked(QListViewItem*) ), |
390 | this, SLOT(slotCurrentChanged(QListViewItem*) ) ); | 390 | this, SLOT(slotCurrentChanged(QListViewItem*) ) ); |
391 | connect(m_view, SIGNAL(mouseButtonClicked(int, QListViewItem*, const QPoint&, int ) ), | 391 | connect(m_view, SIGNAL(mouseButtonClicked(int,QListViewItem*,const QPoint&,int) ), |
392 | this, SLOT(slotClicked(int, QListViewItem*, const QPoint&, int ) ) ); | 392 | this, SLOT(slotClicked(int,QListViewItem*,const QPoint&,int) ) ); |
393 | } | 393 | } |
394 | void OFileViewFileListView::slotCurrentChanged( QListViewItem* item) { | 394 | void OFileViewFileListView::slotCurrentChanged( QListViewItem* item) { |
395 | if (!item) | 395 | if (!item) |
396 | return; | 396 | return; |
397 | #if 0 | 397 | #if 0 |
398 | 398 | ||
399 | OFileSelectorItem *sel = static_cast<OFileSelectorItem*>(item); | 399 | OFileSelectorItem *sel = static_cast<OFileSelectorItem*>(item); |
400 | 400 | ||
401 | if (!sel->isDir() ) { | 401 | if (!sel->isDir() ) { |
402 | selector()->m_lneEdit->setText( sel->text(1) ); | 402 | selector()->m_lneEdit->setText( sel->text(1) ); |
403 | // if in fileselector mode we will emit selected | 403 | // if in fileselector mode we will emit selected |
404 | if ( selector()->mode() == OFileSelector::FileSelector ) { | 404 | if ( selector()->mode() == OFileSelector::FileSelector ) { |
@@ -771,26 +771,26 @@ void OFileSelector::initMime() { | |||
771 | m_cmbMime->insertItem( it.key() ); | 771 | m_cmbMime->insertItem( it.key() ); |
772 | } | 772 | } |
773 | m_cmbMime->setCurrentItem( 0 ); | 773 | m_cmbMime->setCurrentItem( 0 ); |
774 | 774 | ||
775 | connect( m_cmbMime, SIGNAL(activated(int) ), | 775 | connect( m_cmbMime, SIGNAL(activated(int) ), |
776 | this, SLOT(slotMimeTypeChanged() ) ); | 776 | this, SLOT(slotMimeTypeChanged() ) ); |
777 | 777 | ||
778 | } | 778 | } |
779 | void OFileSelector::initViews() { | 779 | void OFileSelector::initViews() { |
780 | m_cmbView->insertItem( QObject::tr("Documents") ); | 780 | m_cmbView->insertItem( QObject::tr("Documents") ); |
781 | m_cmbView->insertItem( QObject::tr("Files") ); | 781 | m_cmbView->insertItem( QObject::tr("Files") ); |
782 | m_cmbView->insertItem( QObject::tr("All Files") ); | 782 | m_cmbView->insertItem( QObject::tr("All Files") ); |
783 | connect(m_cmbView, SIGNAL(activated( const QString& ) ), | 783 | connect(m_cmbView, SIGNAL(activated(const QString&) ), |
784 | this, SLOT(slotViewChange( const QString& ) ) ); | 784 | this, SLOT(slotViewChange(const QString&) ) ); |
785 | 785 | ||
786 | 786 | ||
787 | m_views.insert( QObject::tr("Documents"), new ODocumentFileView(this) ); | 787 | m_views.insert( QObject::tr("Documents"), new ODocumentFileView(this) ); |
788 | 788 | ||
789 | /* see above why add both */ | 789 | /* see above why add both */ |
790 | OFileViewInterface* in = new OFileViewFileSystem( this ); | 790 | OFileViewInterface* in = new OFileViewFileSystem( this ); |
791 | m_views.insert( QObject::tr("Files"), in ); | 791 | m_views.insert( QObject::tr("Files"), in ); |
792 | m_views.insert( QObject::tr("All Files"), in ); | 792 | m_views.insert( QObject::tr("All Files"), in ); |
793 | } | 793 | } |
794 | 794 | ||
795 | /** | 795 | /** |
796 | * d'tor | 796 | * d'tor |
diff --git a/libopie/ofontselector.cpp b/libopie/ofontselector.cpp index 7e07008..87b7869 100644 --- a/libopie/ofontselector.cpp +++ b/libopie/ofontselector.cpp | |||
@@ -110,39 +110,39 @@ static int qt_version ( ) | |||
110 | * @param name The name of the object | 110 | * @param name The name of the object |
111 | * @param fl WidgetFlags | 111 | * @param fl WidgetFlags |
112 | */ | 112 | */ |
113 | OFontSelector::OFontSelector ( bool withpreview, QWidget *parent, const char *name, WFlags fl ) : QWidget ( parent, name, fl ) | 113 | OFontSelector::OFontSelector ( bool withpreview, QWidget *parent, const char *name, WFlags fl ) : QWidget ( parent, name, fl ) |
114 | { | 114 | { |
115 | d = new OFontSelectorPrivate ( ); | 115 | d = new OFontSelectorPrivate ( ); |
116 | 116 | ||
117 | QGridLayout *gridLayout = new QGridLayout ( this, 0, 0, 4, 4 ); | 117 | QGridLayout *gridLayout = new QGridLayout ( this, 0, 0, 4, 4 ); |
118 | gridLayout->setRowStretch ( 4, 10 ); | 118 | gridLayout->setRowStretch ( 4, 10 ); |
119 | 119 | ||
120 | d-> m_font_family_list = new QListBox( this, "FontListBox" ); | 120 | d-> m_font_family_list = new QListBox( this, "FontListBox" ); |
121 | gridLayout->addMultiCellWidget( d-> m_font_family_list, 0, 4, 0, 0 ); | 121 | gridLayout->addMultiCellWidget( d-> m_font_family_list, 0, 4, 0, 0 ); |
122 | connect( d-> m_font_family_list, SIGNAL( highlighted( int ) ), this, SLOT( fontFamilyClicked( int ) ) ); | 122 | connect( d-> m_font_family_list, SIGNAL( highlighted(int) ), this, SLOT( fontFamilyClicked(int) ) ); |
123 | 123 | ||
124 | QLabel *label = new QLabel( tr( "Style" ), this ); | 124 | QLabel *label = new QLabel( tr( "Style" ), this ); |
125 | gridLayout->addWidget( label, 0, 1 ); | 125 | gridLayout->addWidget( label, 0, 1 ); |
126 | 126 | ||
127 | d-> m_font_style_list = new QComboBox( this, "StyleListBox" ); | 127 | d-> m_font_style_list = new QComboBox( this, "StyleListBox" ); |
128 | connect( d-> m_font_style_list, SIGNAL( activated( int ) ), this, SLOT( fontStyleClicked( int ) ) ); | 128 | connect( d-> m_font_style_list, SIGNAL( activated(int) ), this, SLOT( fontStyleClicked(int) ) ); |
129 | gridLayout->addWidget( d-> m_font_style_list, 1, 1 ); | 129 | gridLayout->addWidget( d-> m_font_style_list, 1, 1 ); |
130 | 130 | ||
131 | label = new QLabel( tr( "Size" ), this ); | 131 | label = new QLabel( tr( "Size" ), this ); |
132 | gridLayout->addWidget( label, 2, 1 ); | 132 | gridLayout->addWidget( label, 2, 1 ); |
133 | 133 | ||
134 | d-> m_font_size_list = new QComboBox( this, "SizeListBox" ); | 134 | d-> m_font_size_list = new QComboBox( this, "SizeListBox" ); |
135 | connect( d-> m_font_size_list, SIGNAL( activated( int ) ), | 135 | connect( d-> m_font_size_list, SIGNAL( activated(int) ), |
136 | this, SLOT( fontSizeClicked( int ) ) ); | 136 | this, SLOT( fontSizeClicked(int) ) ); |
137 | gridLayout->addWidget( d-> m_font_size_list, 3, 1 ); | 137 | gridLayout->addWidget( d-> m_font_size_list, 3, 1 ); |
138 | 138 | ||
139 | d-> m_pointbug = ( qt_version ( ) <= 233 ); | 139 | d-> m_pointbug = ( qt_version ( ) <= 233 ); |
140 | 140 | ||
141 | if ( withpreview ) { | 141 | if ( withpreview ) { |
142 | d-> m_preview = new QMultiLineEdit ( this, "Preview" ); | 142 | d-> m_preview = new QMultiLineEdit ( this, "Preview" ); |
143 | d-> m_preview-> setAlignment ( AlignCenter ); | 143 | d-> m_preview-> setAlignment ( AlignCenter ); |
144 | d-> m_preview-> setWordWrap ( QMultiLineEdit::WidgetWidth ); | 144 | d-> m_preview-> setWordWrap ( QMultiLineEdit::WidgetWidth ); |
145 | d-> m_preview-> setMargin ( 3 ); | 145 | d-> m_preview-> setMargin ( 3 ); |
146 | d-> m_preview-> setText ( tr( "The Quick Brown Fox Jumps Over The Lazy Dog" )); | 146 | d-> m_preview-> setText ( tr( "The Quick Brown Fox Jumps Over The Lazy Dog" )); |
147 | gridLayout-> addRowSpacing ( 5, 4 ); | 147 | gridLayout-> addRowSpacing ( 5, 4 ); |
148 | gridLayout-> addMultiCellWidget ( d-> m_preview, 6, 6, 0, 1 ); | 148 | gridLayout-> addMultiCellWidget ( d-> m_preview, 6, 6, 0, 1 ); |
diff --git a/libopie/orecurrancewidget.cpp b/libopie/orecurrancewidget.cpp index d81851e..33be269 100644 --- a/libopie/orecurrancewidget.cpp +++ b/libopie/orecurrancewidget.cpp | |||
@@ -541,26 +541,26 @@ hideExtras(); | |||
541 | QString strEvery = strYearTemplate.arg( start.monthName(start.month()) ).arg( numberPlacing(start.day()) ); | 541 | QString strEvery = strYearTemplate.arg( start.monthName(start.month()) ).arg( numberPlacing(start.day()) ); |
542 | lblRepeat->setText( strEvery ); | 542 | lblRepeat->setText( strEvery ); |
543 | setupRepeatLabel( 1 ); | 543 | setupRepeatLabel( 1 ); |
544 | 544 | ||
545 | } | 545 | } |
546 | void ORecurranceWidget::init() { | 546 | void ORecurranceWidget::init() { |
547 | QPopupMenu *m1 = new QPopupMenu( this ); | 547 | QPopupMenu *m1 = new QPopupMenu( this ); |
548 | repeatPicker = new DateBookMonth( m1, 0, TRUE ); | 548 | repeatPicker = new DateBookMonth( m1, 0, TRUE ); |
549 | m1->insertItem( repeatPicker ); | 549 | m1->insertItem( repeatPicker ); |
550 | cmdEnd->setPopup( m1 ); | 550 | cmdEnd->setPopup( m1 ); |
551 | cmdEnd->setPopupDelay( 0 ); | 551 | cmdEnd->setPopupDelay( 0 ); |
552 | 552 | ||
553 | QObject::connect( repeatPicker, SIGNAL(dateClicked(int, int, int)), | 553 | QObject::connect( repeatPicker, SIGNAL(dateClicked(int,int,int)), |
554 | this, SLOT(endDateChanged(int, int, int)) ); | 554 | this, SLOT(endDateChanged(int,int,int)) ); |
555 | QObject::connect( qApp, SIGNAL(weekChanged(bool)), | 555 | QObject::connect( qApp, SIGNAL(weekChanged(bool)), |
556 | this, SLOT(slotChangeStartOfWeek(bool)) ); | 556 | this, SLOT(slotChangeStartOfWeek(bool)) ); |
557 | 557 | ||
558 | listRTypeButtons.setAutoDelete( TRUE ); | 558 | listRTypeButtons.setAutoDelete( TRUE ); |
559 | listRTypeButtons.append( cmdNone ); | 559 | listRTypeButtons.append( cmdNone ); |
560 | listRTypeButtons.append( cmdDay ); | 560 | listRTypeButtons.append( cmdDay ); |
561 | listRTypeButtons.append( cmdWeek ); | 561 | listRTypeButtons.append( cmdWeek ); |
562 | listRTypeButtons.append( cmdMonth ); | 562 | listRTypeButtons.append( cmdMonth ); |
563 | listRTypeButtons.append( cmdYear ); | 563 | listRTypeButtons.append( cmdYear ); |
564 | 564 | ||
565 | listExtra.setAutoDelete( TRUE ); | 565 | listExtra.setAutoDelete( TRUE ); |
566 | listExtra.append( cmdExtra1 ); | 566 | listExtra.append( cmdExtra1 ); |
diff --git a/libopie/otabwidget.cpp b/libopie/otabwidget.cpp index 3a9a5ec..52190b2 100644 --- a/libopie/otabwidget.cpp +++ b/libopie/otabwidget.cpp | |||
@@ -61,29 +61,29 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi | |||
61 | p = Top; | 61 | p = Top; |
62 | } | 62 | } |
63 | } | 63 | } |
64 | 64 | ||
65 | widgetStack = new QWidgetStack( this, "widgetstack" ); | 65 | widgetStack = new QWidgetStack( this, "widgetstack" ); |
66 | widgetStack->setFrameStyle( QFrame::NoFrame ); | 66 | widgetStack->setFrameStyle( QFrame::NoFrame ); |
67 | widgetStack->setLineWidth( style().defaultFrameWidth() ); | 67 | widgetStack->setLineWidth( style().defaultFrameWidth() ); |
68 | 68 | ||
69 | tabBarStack = new QWidgetStack( this, "tabbarstack" ); | 69 | tabBarStack = new QWidgetStack( this, "tabbarstack" ); |
70 | 70 | ||
71 | tabBar = new OTabBar( tabBarStack, "tabbar" ); | 71 | tabBar = new OTabBar( tabBarStack, "tabbar" ); |
72 | tabBarStack->addWidget( tabBar, 0 ); | 72 | tabBarStack->addWidget( tabBar, 0 ); |
73 | connect( tabBar, SIGNAL( selected( int ) ), this, SLOT( slotTabBarSelected( int ) ) ); | 73 | connect( tabBar, SIGNAL( selected(int) ), this, SLOT( slotTabBarSelected(int) ) ); |
74 | 74 | ||
75 | tabList = new QComboBox( false, tabBarStack, "tablist" ); | 75 | tabList = new QComboBox( false, tabBarStack, "tablist" ); |
76 | tabBarStack->addWidget( tabList, 1 ); | 76 | tabBarStack->addWidget( tabList, 1 ); |
77 | connect( tabList, SIGNAL( activated( int ) ), this, SLOT( slotTabListSelected( int ) ) ); | 77 | connect( tabList, SIGNAL( activated(int) ), this, SLOT( slotTabListSelected(int) ) ); |
78 | 78 | ||
79 | tabBarPosition = p; | 79 | tabBarPosition = p; |
80 | setTabStyle( s ); | 80 | setTabStyle( s ); |
81 | setTabPosition( p ); | 81 | setTabPosition( p ); |
82 | 82 | ||
83 | currTab= 0x0; | 83 | currTab= 0x0; |
84 | } | 84 | } |
85 | 85 | ||
86 | OTabWidget::~OTabWidget() | 86 | OTabWidget::~OTabWidget() |
87 | { | 87 | { |
88 | } | 88 | } |
89 | 89 | ||
diff --git a/libopie/otimepicker.cpp b/libopie/otimepicker.cpp index 1eca7c5..11b80ed 100644 --- a/libopie/otimepicker.cpp +++ b/libopie/otimepicker.cpp | |||
@@ -164,30 +164,30 @@ void OTimePicker::setHour(int h) { | |||
164 | 164 | ||
165 | /** | 165 | /** |
166 | * This is a modal Dialog. | 166 | * This is a modal Dialog. |
167 | * | 167 | * |
168 | * @param parent The parent widget | 168 | * @param parent The parent widget |
169 | * @param name The name of the object | 169 | * @param name The name of the object |
170 | * @param fl Possible window flags | 170 | * @param fl Possible window flags |
171 | */ | 171 | */ |
172 | OTimePickerDialog::OTimePickerDialog ( QWidget* parent, const char* name, WFlags fl ) | 172 | OTimePickerDialog::OTimePickerDialog ( QWidget* parent, const char* name, WFlags fl ) |
173 | : OTimePickerDialogBase (parent , name, true , fl) | 173 | : OTimePickerDialogBase (parent , name, true , fl) |
174 | { | 174 | { |
175 | 175 | ||
176 | connect ( m_timePicker, SIGNAL( timeChanged( const QTime& ) ), | 176 | connect ( m_timePicker, SIGNAL( timeChanged(const QTime&) ), |
177 | this, SLOT( setTime ( const QTime& ) ) ); | 177 | this, SLOT( setTime(const QTime&) ) ); |
178 | connect ( minuteField, SIGNAL( textChanged ( const QString& ) ), | 178 | connect ( minuteField, SIGNAL( textChanged(const QString&) ), |
179 | this, SLOT ( setMinute ( const QString& ) ) ); | 179 | this, SLOT ( setMinute(const QString&) ) ); |
180 | connect ( hourField, SIGNAL( textChanged ( const QString& ) ), | 180 | connect ( hourField, SIGNAL( textChanged(const QString&) ), |
181 | this, SLOT ( setHour ( const QString& ) ) ); | 181 | this, SLOT ( setHour(const QString&) ) ); |
182 | 182 | ||
183 | } | 183 | } |
184 | 184 | ||
185 | /** | 185 | /** |
186 | * @return the time | 186 | * @return the time |
187 | */ | 187 | */ |
188 | QTime OTimePickerDialog::time()const | 188 | QTime OTimePickerDialog::time()const |
189 | { | 189 | { |
190 | return m_time; | 190 | return m_time; |
191 | } | 191 | } |
192 | 192 | ||
193 | /** | 193 | /** |
diff --git a/libopie/pim/ocontactaccess.cpp b/libopie/pim/ocontactaccess.cpp index 2e3ec1f..bc359f7 100644 --- a/libopie/pim/ocontactaccess.cpp +++ b/libopie/pim/ocontactaccess.cpp | |||
@@ -12,24 +12,29 @@ | |||
12 | * Info: This class could just work with a change in the header-file | 12 | * Info: This class could just work with a change in the header-file |
13 | * of the Contact class ! Therefore our libopie only compiles | 13 | * of the Contact class ! Therefore our libopie only compiles |
14 | * with our version of libqpe | 14 | * with our version of libqpe |
15 | * ===================================================================== | 15 | * ===================================================================== |
16 | * ToDo: XML-Backend: Automatic reload if something was changed... | 16 | * ToDo: XML-Backend: Automatic reload if something was changed... |
17 | * | 17 | * |
18 | * | 18 | * |
19 | * ===================================================================== | 19 | * ===================================================================== |
20 | * Version: $Id$ | 20 | * Version: $Id$ |
21 | * ===================================================================== | 21 | * ===================================================================== |
22 | * History: | 22 | * History: |
23 | * $Log$ | 23 | * $Log$ |
24 | * Revision 1.9 2004/03/02 12:14:22 alwin | ||
25 | * run the optimize_connect script | ||
26 | * the whole cvs is tagged with "before_optimize_connect" if there are problems you | ||
27 | * can check the diff (but it had compiled and run here) | ||
28 | * | ||
24 | * Revision 1.8 2003/05/08 13:55:09 tille | 29 | * Revision 1.8 2003/05/08 13:55:09 tille |
25 | * search stuff | 30 | * search stuff |
26 | * and match, toRichText & toShortText in oevent | 31 | * and match, toRichText & toShortText in oevent |
27 | * | 32 | * |
28 | * Revision 1.7 2002/11/13 14:14:51 eilers | 33 | * Revision 1.7 2002/11/13 14:14:51 eilers |
29 | * Added sorted for Contacts.. | 34 | * Added sorted for Contacts.. |
30 | * | 35 | * |
31 | * Revision 1.6 2002/11/01 15:10:42 eilers | 36 | * Revision 1.6 2002/11/01 15:10:42 eilers |
32 | * Added regExp-search in database for all fields in a contact. | 37 | * Added regExp-search in database for all fields in a contact. |
33 | * | 38 | * |
34 | * Revision 1.5 2002/10/16 10:52:40 eilers | 39 | * Revision 1.5 2002/10/16 10:52:40 eilers |
35 | * Added some docu to the interface and now using the cache infrastucture by zecke.. :) | 40 | * Added some docu to the interface and now using the cache infrastucture by zecke.. :) |
@@ -82,30 +87,30 @@ OContactAccess::OContactAccess ( const QString appname, const QString , | |||
82 | */ | 87 | */ |
83 | if( end == 0 ) { | 88 | if( end == 0 ) { |
84 | qWarning ("Using BackendFactory !"); | 89 | qWarning ("Using BackendFactory !"); |
85 | end = OBackendFactory<OContactAccessBackend>::Default( "contact", appname ); | 90 | end = OBackendFactory<OContactAccessBackend>::Default( "contact", appname ); |
86 | } | 91 | } |
87 | // Set backend locally and in template | 92 | // Set backend locally and in template |
88 | m_backEnd = end; | 93 | m_backEnd = end; |
89 | OPimAccessTemplate<OContact>::setBackEnd (end); | 94 | OPimAccessTemplate<OContact>::setBackEnd (end); |
90 | 95 | ||
91 | 96 | ||
92 | /* Connect signal of external db change to function */ | 97 | /* Connect signal of external db change to function */ |
93 | QCopChannel *dbchannel = new QCopChannel( "QPE/PIM", this ); | 98 | QCopChannel *dbchannel = new QCopChannel( "QPE/PIM", this ); |
94 | connect( dbchannel, SIGNAL(received(const QCString &, const QByteArray &)), | 99 | connect( dbchannel, SIGNAL(received(const QCString&,const QByteArray&)), |
95 | this, SLOT(copMessage( const QCString &, const QByteArray &)) ); | 100 | this, SLOT(copMessage(const QCString&,const QByteArray&)) ); |
96 | if ( autosync ){ | 101 | if ( autosync ){ |
97 | QCopChannel *syncchannel = new QCopChannel( "QPE/Sync", this ); | 102 | QCopChannel *syncchannel = new QCopChannel( "QPE/Sync", this ); |
98 | connect( syncchannel, SIGNAL(received(const QCString &, const QByteArray &)), | 103 | connect( syncchannel, SIGNAL(received(const QCString&,const QByteArray&)), |
99 | this, SLOT(copMessage( const QCString &, const QByteArray &)) ); | 104 | this, SLOT(copMessage(const QCString&,const QByteArray&)) ); |
100 | } | 105 | } |
101 | 106 | ||
102 | 107 | ||
103 | } | 108 | } |
104 | OContactAccess::~OContactAccess () | 109 | OContactAccess::~OContactAccess () |
105 | { | 110 | { |
106 | /* The user may forget to save the changed database, therefore try to | 111 | /* The user may forget to save the changed database, therefore try to |
107 | * do it for him.. | 112 | * do it for him.. |
108 | */ | 113 | */ |
109 | save(); | 114 | save(); |
110 | // delete m_backEnd; is done by template.. | 115 | // delete m_backEnd; is done by template.. |
111 | } | 116 | } |
diff --git a/libopie/pim/opimmainwindow.cpp b/libopie/pim/opimmainwindow.cpp index 2739e26..99a0333 100644 --- a/libopie/pim/opimmainwindow.cpp +++ b/libopie/pim/opimmainwindow.cpp | |||
@@ -9,28 +9,28 @@ | |||
9 | #include "opimresolver.h" | 9 | #include "opimresolver.h" |
10 | #include "opimmainwindow.h" | 10 | #include "opimmainwindow.h" |
11 | 11 | ||
12 | OPimMainWindow::OPimMainWindow( const QString& service, QWidget* parent, | 12 | OPimMainWindow::OPimMainWindow( const QString& service, QWidget* parent, |
13 | const char* name, WFlags flag ) | 13 | const char* name, WFlags flag ) |
14 | : QMainWindow( parent, name, flag ), m_rtti(-1), m_service( service ), m_fallBack(0l) { | 14 | : QMainWindow( parent, name, flag ), m_rtti(-1), m_service( service ), m_fallBack(0l) { |
15 | 15 | ||
16 | /* | 16 | /* |
17 | * let's generate our QCopChannel | 17 | * let's generate our QCopChannel |
18 | */ | 18 | */ |
19 | m_str = QString("QPE/"+m_service).local8Bit(); | 19 | m_str = QString("QPE/"+m_service).local8Bit(); |
20 | m_channel= new QCopChannel(m_str, this ); | 20 | m_channel= new QCopChannel(m_str, this ); |
21 | connect(m_channel, SIGNAL(received(const QCString&, const QByteArray& ) ), | 21 | connect(m_channel, SIGNAL(received(const QCString&,const QByteArray&) ), |
22 | this, SLOT( appMessage( const QCString&, const QByteArray& ) ) ); | 22 | this, SLOT( appMessage(const QCString&,const QByteArray&) ) ); |
23 | connect(qApp, SIGNAL(appMessage(const QCString&, const QByteArray& ) ), | 23 | connect(qApp, SIGNAL(appMessage(const QCString&,const QByteArray&) ), |
24 | this, SLOT( appMessage( const QCString&, const QByteArray& ) ) ); | 24 | this, SLOT( appMessage(const QCString&,const QByteArray&) ) ); |
25 | 25 | ||
26 | /* connect flush and reload */ | 26 | /* connect flush and reload */ |
27 | connect(qApp, SIGNAL(flush() ), | 27 | connect(qApp, SIGNAL(flush() ), |
28 | this, SLOT(flush() ) ); | 28 | this, SLOT(flush() ) ); |
29 | connect(qApp, SIGNAL(reload() ), | 29 | connect(qApp, SIGNAL(reload() ), |
30 | this, SLOT(reload() ) ); | 30 | this, SLOT(reload() ) ); |
31 | } | 31 | } |
32 | OPimMainWindow::~OPimMainWindow() { | 32 | OPimMainWindow::~OPimMainWindow() { |
33 | delete m_channel; | 33 | delete m_channel; |
34 | } | 34 | } |
35 | QCopChannel* OPimMainWindow::channel() { | 35 | QCopChannel* OPimMainWindow::channel() { |
36 | return m_channel; | 36 | return m_channel; |