Only in ksendfax-0.3.1/: Makefile Only in ksendfax-0.3.1/: config.cache Only in ksendfax-0.3.1/: config.h Only in ksendfax-0.3.1/: config.log Only in ksendfax-0.3.1/: config.status Only in ksendfax-0.3.1/ksendfax: Makefile Only in ksendfax-0.3.1/ksendfax/doc: Makefile Only in ksendfax-0.3.1/ksendfax/doc/en: Makefile Only in ksendfax-0.3.1/ksendfax: ksendfax diff -ur /home/joerg/ksendfax-0.3.1/ksendfax/ksendfax.cpp ksendfax-0.3.1/ksendfax/ksendfax.cpp --- /home/joerg/ksendfax-0.3.1/ksendfax/ksendfax.cpp Fri Oct 9 12:56:44 1998 +++ ksendfax-0.3.1/ksendfax/ksendfax.cpp Fri Apr 23 22:00:12 1999 @@ -26,16 +26,16 @@ #include #include -#include +#include #include -#include +#include #include -#include +#include #include -#include +#include #include -#include +#include #include #include "ksendfax.h" @@ -59,17 +59,17 @@ setCaption( "KSendFax V" VERSION); connect(browseButton, SIGNAL(clicked()), SLOT(BrowseFileCB())); // add some tooltips - QToolTip::add(browseButton, i18n("Browse a file")); - QToolTip::add(buttonAddFile, i18n("Add file to list")); - QToolTip::add(buttonRemoveFile, i18n("Remove file from list")); + QToolTip::add(browseButton, tr("Browse a file")); + QToolTip::add(buttonAddFile, tr("Add file to list")); + QToolTip::add(buttonRemoveFile, tr("Remove file from list")); current_directory = QDir::currentDirPath(); - error_listbox = new LogListBox(0,i18n("Fax Send Log")); + error_listbox = new LogListBox(0, tr("Fax Send Log")); error_listbox->setIcon(kapp->getIconLoader()->loadIcon("faxsend.xpm")); - show_listbox = new LogListBox(0,i18n("Show Fax Queue")); + show_listbox = new LogListBox(0, tr("Show Fax Queue")); show_listbox->setIcon(kapp->getIconLoader()->loadIcon("faxshow.xpm")); - remove_listbox = new LogListBox(0,i18n("Remove Log")); + remove_listbox = new LogListBox(0, tr("Remove Log")); remove_listbox->setIcon(kapp->getIconLoader()->loadIcon("faxremove.xpm")); - // set labels for i18n + // set labels for internationalisation labelFileName->setAutoResize(true); labelDestination->setAutoResize(true); labelFaxNo->setAutoResize(true); @@ -77,14 +77,14 @@ labelEnterprise->setAutoResize(true); labelComment->setAutoResize(true); labelPhonebook->setAutoResize(true); - labelFileName->setText(i18n("File Name:")); - labelDestination->setText(i18n("Destination:")); - labelFaxNo->setText(i18n("Fax no.:")); - labelDestName->setText(i18n("Dest. Name:")); - labelEnterprise->setText(i18n("Enterprise:")); - labelComment->setText(i18n("Comment:")); - labelPhonebook->setText(i18n("Phonebook")); - browseButton->setText(i18n("&Browse")); + labelFileName->setText( tr("File Name:")); + labelDestination->setText( tr("Destination:")); + labelFaxNo->setText( tr("Fax no.:")); + labelDestName->setText( tr("Dest. Name:")); + labelEnterprise->setText( tr("Enterprise:")); + labelComment->setText( tr("Comment:")); + labelPhonebook->setText( tr("Phonebook")); + browseButton->setText( tr("&Browse")); setPos(labelFileName,InputFName); setPos(labelFaxNo,InputFaxNumber); setPos(labelDestName,InputDestName); @@ -194,7 +194,7 @@ result = proc->start(KProcess::Block, KProcess::NoCommunication); if(!result){ QString str; - str.sprintf(i18n("Cannot start a new program\nfork() failed.")); + str.sprintf( tr("Cannot start a new program\nfork() failed.")); QMessageBox::critical(this,"KSendFax",str.data()); if (proc) { if(proc->isRunning()) @@ -221,7 +221,7 @@ result = proc->start(KProcess::NotifyOnExit , KProcess::All); if(!result){ QString str; - str.sprintf(i18n("Cannot start a new program\nfork() failed.")); + str.sprintf( tr("Cannot start a new program\nfork() failed.")); QMessageBox::critical(this,"KSendFax",str.data()); if(proc->isRunning()) proc->kill(); @@ -301,7 +301,7 @@ QString fname; QFileDialog *box; - box = getFileDialog(i18n("Select Document to Open")); + box = getFileDialog( tr("Select Document to Open")); box->show(); if (!box->result()) /* cancelled */ @@ -649,7 +649,7 @@ static QPushButton *cancel; if (!askIDdiag) { - askIDdiag = new QDialog(0,i18n("Input Fax ID"),true); + askIDdiag = new QDialog(0, tr("Input Fax ID"),true); CHECK_PTR(askIDdiag); label = new QLabel(askIDdiag, "Label"); CHECK_PTR(label); @@ -661,7 +661,7 @@ CHECK_PTR(cancel); label->setGeometry( 10, 10, 50, 30 ); - label->setText(i18n("Fax ID:")); + label->setText( tr("Fax ID:")); label->setAlignment(289); label->setMargin(-1); @@ -669,12 +669,12 @@ inputID->setMaxLength(30); ok->setGeometry( 55, 45, 60, 25 ); - ok->setText(i18n("Ok")); + ok->setText( tr("Ok")); ok->setDefault(TRUE); connect(ok, SIGNAL(clicked()), askIDdiag, SLOT(accept())); cancel->setGeometry( 125, 45, 60, 25 ); - cancel->setText(i18n("&Cancel")); + cancel->setText( tr("&Cancel")); connect(cancel, SIGNAL(clicked()), askIDdiag, SLOT(reject())); askIDdiag->resize( 190,75 ); Only in ksendfax-0.3.1/ksendfax: ksendfax.o diff -ur /home/joerg/ksendfax-0.3.1/ksendfax/ksendfax_moc.cpp ksendfax-0.3.1/ksendfax/ksendfax_moc.cpp --- /home/joerg/ksendfax-0.3.1/ksendfax/ksendfax_moc.cpp Thu Oct 8 14:37:33 1998 +++ ksendfax-0.3.1/ksendfax/ksendfax_moc.cpp Fri Apr 23 21:45:37 1999 @@ -1,20 +1,21 @@ /**************************************************************************** ** KSendFax meta object code from reading C++ file 'ksendfax.h' ** -** Created: Thu Oct 8 14:37:33 1998 -** by: The Qt Meta Object Compiler ($Revision: 2.25 $) +** Created: Fri Apr 23 21:24:06 1999 +** by: The Qt Meta Object Compiler ($Revision: 2.45 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ #if !defined(Q_MOC_OUTPUT_REVISION) -#define Q_MOC_OUTPUT_REVISION 2 -#elif Q_MOC_OUTPUT_REVISION != 2 +#define Q_MOC_OUTPUT_REVISION 3 +#elif Q_MOC_OUTPUT_REVISION != 3 #error "Moc format conflict - please regenerate all moc files" #endif #include "ksendfax.h" #include +#include const char *KSendFax::className() const @@ -24,14 +25,38 @@ QMetaObject *KSendFax::metaObj = 0; + +#if QT_VERSION >= 199 +static QMetaObjectInit init_KSendFax(&KSendFax::staticMetaObject); + +#endif + void KSendFax::initMetaObject() { if ( metaObj ) return; if ( strcmp(KSendFaxData::className(), "KSendFaxData") != 0 ) badSuperclassWarning("KSendFax","KSendFaxData"); - if ( !KSendFaxData::metaObject() ) - KSendFaxData::initMetaObject(); + +#if QT_VERSION >= 199 + staticMetaObject(); +} + +QString KSendFax::tr(const char* s) +{ + return qApp->translate("KSendFax",s); +} + +void KSendFax::staticMetaObject() +{ + if ( metaObj ) + return; + KSendFaxData::staticMetaObject(); +#else + + KSendFaxData::initMetaObject(); +#endif + typedef void(KSendFax::*m1_t0)(); typedef void(KSendFax::*m1_t1)(); typedef void(KSendFax::*m1_t2)(KProcess*,char*,int); @@ -48,7 +73,7 @@ m1_t5 v1_5 = &KSendFax::pbSelectCB; m1_t6 v1_6 = &KSendFax::AddFileCB; m1_t7 v1_7 = &KSendFax::RemoveFileCB; - QMetaData *slot_tbl = new QMetaData[8]; + QMetaData *slot_tbl = QMetaObject::new_metadata(8); slot_tbl[0].name = "SendFaxCB()"; slot_tbl[1].name = "BrowseFileCB()"; slot_tbl[2].name = "ReadStderr(KProcess*,char*,int)"; @@ -67,10 +92,11 @@ slot_tbl[7].ptr = *((QMember*)&v1_7); typedef void(KSendFax::*m2_t0)(); m2_t0 v2_0 = &KSendFax::ExitKSendFax; - QMetaData *signal_tbl = new QMetaData[1]; + QMetaData *signal_tbl = QMetaObject::new_metadata(1); signal_tbl[0].name = "ExitKSendFax()"; signal_tbl[0].ptr = *((QMember*)&v2_0); - metaObj = new QMetaObject( "KSendFax", "KSendFaxData", + metaObj = QMetaObject::new_metaobject( + "KSendFax", "KSendFaxData", slot_tbl, 8, signal_tbl, 1 ); } Only in ksendfax-0.3.1/ksendfax: ksendfax_moc.o Only in ksendfax-0.3.1/ksendfax: ksendfaxdata.o diff -ur /home/joerg/ksendfax-0.3.1/ksendfax/ksendfaxdata_moc.cpp ksendfax-0.3.1/ksendfax/ksendfaxdata_moc.cpp --- /home/joerg/ksendfax-0.3.1/ksendfax/ksendfaxdata_moc.cpp Mon Sep 28 13:13:03 1998 +++ ksendfax-0.3.1/ksendfax/ksendfaxdata_moc.cpp Fri Apr 23 22:00:28 1999 @@ -1,20 +1,21 @@ /**************************************************************************** ** KSendFaxData meta object code from reading C++ file 'ksendfaxdata.h' ** -** Created: Mon Sep 28 13:13:03 1998 -** by: The Qt Meta Object Compiler ($Revision: 2.25 $) +** Created: Fri Apr 23 22:00:28 1999 +** by: The Qt Meta Object Compiler ($Revision: 2.45 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ #if !defined(Q_MOC_OUTPUT_REVISION) -#define Q_MOC_OUTPUT_REVISION 2 -#elif Q_MOC_OUTPUT_REVISION != 2 +#define Q_MOC_OUTPUT_REVISION 3 +#elif Q_MOC_OUTPUT_REVISION != 3 #error "Moc format conflict - please regenerate all moc files" #endif #include "ksendfaxdata.h" #include +#include const char *KSendFaxData::className() const @@ -24,20 +25,45 @@ QMetaObject *KSendFaxData::metaObj = 0; + +#if QT_VERSION >= 199 +static QMetaObjectInit init_KSendFaxData(&KSendFaxData::staticMetaObject); + +#endif + void KSendFaxData::initMetaObject() { if ( metaObj ) return; if ( strcmp(QWidget::className(), "QWidget") != 0 ) badSuperclassWarning("KSendFaxData","QWidget"); - if ( !QWidget::metaObject() ) - QWidget::initMetaObject(); + +#if QT_VERSION >= 199 + staticMetaObject(); +} + +QString KSendFaxData::tr(const char* s) +{ + return qApp->translate("KSendFaxData",s); +} + +void KSendFaxData::staticMetaObject() +{ + if ( metaObj ) + return; + QWidget::staticMetaObject(); +#else + + QWidget::initMetaObject(); +#endif + typedef void(KSendFaxData::*m1_t0)(const char*); m1_t0 v1_0 = &KSendFaxData::pbSelectCB; - QMetaData *slot_tbl = new QMetaData[1]; + QMetaData *slot_tbl = QMetaObject::new_metadata(1); slot_tbl[0].name = "pbSelectCB(const char*)"; slot_tbl[0].ptr = *((QMember*)&v1_0); - metaObj = new QMetaObject( "KSendFaxData", "QWidget", + metaObj = QMetaObject::new_metaobject( + "KSendFaxData", "QWidget", slot_tbl, 1, 0, 0 ); } Only in ksendfax-0.3.1/ksendfax: ksendfaxdata_moc.o diff -ur /home/joerg/ksendfax-0.3.1/ksendfax/loglistbox.cpp ksendfax-0.3.1/ksendfax/loglistbox.cpp --- /home/joerg/ksendfax-0.3.1/ksendfax/loglistbox.cpp Thu Oct 8 16:02:46 1998 +++ ksendfax-0.3.1/ksendfax/loglistbox.cpp Fri Apr 23 22:01:45 1999 @@ -7,11 +7,11 @@ *********************************************************************/ -#include +#include #include -#include +#include #include -#include +#include #include @@ -121,7 +121,7 @@ if (!timerID && (timerUpdate > 0)) { if (!(timerID = startTimer(timerUpdate))) - QMessageBox::warning(this,"KSendFax",i18n("Cannot start TIMER")); + QMessageBox::warning(this,"KSendFax", tr("Cannot start TIMER")); } MyProcess @@ -134,7 +134,7 @@ bool result = proc->start(KProcess::NotifyOnExit , KProcess::All); if(!result){ QString str; - str.sprintf(i18n("Cannot start a new program\nfork() failed.")); + str.sprintf( tr("Cannot start a new program\nfork() failed.")); QMessageBox::critical(this,"KSendFax",str.data()); if (proc) { if(proc->isRunning()) Only in ksendfax-0.3.1/ksendfax: loglistbox.o diff -ur /home/joerg/ksendfax-0.3.1/ksendfax/loglistbox_moc.cpp ksendfax-0.3.1/ksendfax/loglistbox_moc.cpp --- /home/joerg/ksendfax-0.3.1/ksendfax/loglistbox_moc.cpp Thu Oct 8 13:55:28 1998 +++ ksendfax-0.3.1/ksendfax/loglistbox_moc.cpp Fri Apr 23 22:00:41 1999 @@ -1,20 +1,21 @@ /**************************************************************************** ** LogListBox meta object code from reading C++ file 'loglistbox.h' ** -** Created: Thu Oct 8 13:55:28 1998 -** by: The Qt Meta Object Compiler ($Revision: 2.25 $) +** Created: Fri Apr 23 22:00:41 1999 +** by: The Qt Meta Object Compiler ($Revision: 2.45 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ #if !defined(Q_MOC_OUTPUT_REVISION) -#define Q_MOC_OUTPUT_REVISION 2 -#elif Q_MOC_OUTPUT_REVISION != 2 +#define Q_MOC_OUTPUT_REVISION 3 +#elif Q_MOC_OUTPUT_REVISION != 3 #error "Moc format conflict - please regenerate all moc files" #endif #include "loglistbox.h" #include +#include const char *LogListBox::className() const @@ -24,28 +25,53 @@ QMetaObject *LogListBox::metaObj = 0; + +#if QT_VERSION >= 199 +static QMetaObjectInit init_LogListBox(&LogListBox::staticMetaObject); + +#endif + void LogListBox::initMetaObject() { if ( metaObj ) return; if ( strcmp(LogListBoxData::className(), "LogListBoxData") != 0 ) badSuperclassWarning("LogListBox","LogListBoxData"); - if ( !LogListBoxData::metaObject() ) - LogListBoxData::initMetaObject(); + +#if QT_VERSION >= 199 + staticMetaObject(); +} + +QString LogListBox::tr(const char* s) +{ + return qApp->translate("LogListBox",s); +} + +void LogListBox::staticMetaObject() +{ + if ( metaObj ) + return; + LogListBoxData::staticMetaObject(); +#else + + LogListBoxData::initMetaObject(); +#endif + typedef void(LogListBox::*m1_t0)(KProcess*); typedef void(LogListBox::*m1_t1)(QTimerEvent*); typedef void(LogListBox::*m1_t2)(); m1_t0 v1_0 = &LogListBox::CommandDone; m1_t1 v1_1 = &LogListBox::timerEvent; m1_t2 v1_2 = &LogListBox::hideBox; - QMetaData *slot_tbl = new QMetaData[3]; + QMetaData *slot_tbl = QMetaObject::new_metadata(3); slot_tbl[0].name = "CommandDone(KProcess*)"; slot_tbl[1].name = "timerEvent(QTimerEvent*)"; slot_tbl[2].name = "hideBox()"; slot_tbl[0].ptr = *((QMember*)&v1_0); slot_tbl[1].ptr = *((QMember*)&v1_1); slot_tbl[2].ptr = *((QMember*)&v1_2); - metaObj = new QMetaObject( "LogListBox", "LogListBoxData", + metaObj = QMetaObject::new_metaobject( + "LogListBox", "LogListBoxData", slot_tbl, 3, 0, 0 ); } Only in ksendfax-0.3.1/ksendfax: loglistbox_moc.o Only in ksendfax-0.3.1/ksendfax: loglistboxdata.o diff -ur /home/joerg/ksendfax-0.3.1/ksendfax/loglistboxdata_moc.cpp ksendfax-0.3.1/ksendfax/loglistboxdata_moc.cpp --- /home/joerg/ksendfax-0.3.1/ksendfax/loglistboxdata_moc.cpp Mon Sep 28 13:13:07 1998 +++ ksendfax-0.3.1/ksendfax/loglistboxdata_moc.cpp Fri Apr 23 22:01:54 1999 @@ -1,20 +1,21 @@ /**************************************************************************** ** LogListBoxData meta object code from reading C++ file 'loglistboxdata.h' ** -** Created: Mon Sep 28 13:13:07 1998 -** by: The Qt Meta Object Compiler ($Revision: 2.25 $) +** Created: Fri Apr 23 22:01:54 1999 +** by: The Qt Meta Object Compiler ($Revision: 2.45 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ #if !defined(Q_MOC_OUTPUT_REVISION) -#define Q_MOC_OUTPUT_REVISION 2 -#elif Q_MOC_OUTPUT_REVISION != 2 +#define Q_MOC_OUTPUT_REVISION 3 +#elif Q_MOC_OUTPUT_REVISION != 3 #error "Moc format conflict - please regenerate all moc files" #endif #include "loglistboxdata.h" #include +#include const char *LogListBoxData::className() const @@ -24,15 +25,40 @@ QMetaObject *LogListBoxData::metaObj = 0; + +#if QT_VERSION >= 199 +static QMetaObjectInit init_LogListBoxData(&LogListBoxData::staticMetaObject); + +#endif + void LogListBoxData::initMetaObject() { if ( metaObj ) return; if ( strcmp(QDialog::className(), "QDialog") != 0 ) badSuperclassWarning("LogListBoxData","QDialog"); - if ( !QDialog::metaObject() ) - QDialog::initMetaObject(); - metaObj = new QMetaObject( "LogListBoxData", "QDialog", + +#if QT_VERSION >= 199 + staticMetaObject(); +} + +QString LogListBoxData::tr(const char* s) +{ + return qApp->translate("LogListBoxData",s); +} + +void LogListBoxData::staticMetaObject() +{ + if ( metaObj ) + return; + QDialog::staticMetaObject(); +#else + + QDialog::initMetaObject(); +#endif + + metaObj = QMetaObject::new_metaobject( + "LogListBoxData", "QDialog", 0, 0, 0, 0 ); } Only in ksendfax-0.3.1/ksendfax: loglistboxdata_moc.o diff -ur /home/joerg/ksendfax-0.3.1/ksendfax/main.cpp ksendfax-0.3.1/ksendfax/main.cpp --- /home/joerg/ksendfax-0.3.1/ksendfax/main.cpp Thu Oct 8 17:03:08 1998 +++ ksendfax-0.3.1/ksendfax/main.cpp Fri Apr 23 21:50:57 1999 @@ -43,13 +43,13 @@ printf(KSENDFAX_VERSION); printf("\n"); printf("Copyright (C) 1998 Jürgen Vigna (jug@sad.it)\n\n"); - printf(i18n("Frontend for sending faxes for the KDE Desktop Environment\n")); - printf(i18n("Permitted arguments:\n")); - printf(i18n("-oneshot : exits ksendfax after sending one fax\n")); - printf(i18n("-help : displays this message\n")); - printf(i18n("-version : displays the version number\n")); - printf(i18n(" : inserts this filename in the File-Input-Field\n")); - printf(i18n("And all KApplication and Qt-toolkit arguments.\n")); + printf(KSendFax::tr("Frontend for sending faxes for the KDE Desktop Environment\n")); + printf(KSendFax::tr("Permitted arguments:\n")); + printf(KSendFax::tr("-oneshot : exits ksendfax after sending one fax\n")); + printf(KSendFax::tr("-help : displays this message\n")); + printf(KSendFax::tr("-version : displays the version number\n")); + printf(KSendFax::tr(" : inserts this filename in the File-Input-Field\n")); + printf(KSendFax::tr("And all KApplication and Qt-toolkit arguments.\n")); exit(0); } else break; Only in ksendfax-0.3.1/ksendfax: main.o diff -ur /home/joerg/ksendfax-0.3.1/ksendfax/mainwidget.cpp ksendfax-0.3.1/ksendfax/mainwidget.cpp --- /home/joerg/ksendfax-0.3.1/ksendfax/mainwidget.cpp Thu Oct 8 12:25:32 1998 +++ ksendfax-0.3.1/ksendfax/mainwidget.cpp Fri Apr 23 22:08:28 1999 @@ -22,9 +22,9 @@ #include #endif -#include +#include #include -#include +#include #include #include #include @@ -80,47 +80,47 @@ int MainWidget::initMenu() { QPopupMenu *file = new QPopupMenu; - file->insertItem(i18n("&Send Fax..."), ID_FILE_SEND); - file->insertItem(i18n("Sho&w Jobs"), ID_FILE_SHOW); - file->insertItem(i18n("&Remove Job"), ID_FILE_REMOVE); + file->insertItem( tr("&Send Fax..."), ID_FILE_SEND); + file->insertItem( tr("Sho&w Jobs"), ID_FILE_SHOW); + file->insertItem( tr("&Remove Job"), ID_FILE_REMOVE); file->setAccel(CTRL+Key_S, ID_FILE_SEND); file->setAccel(CTRL+Key_W, ID_FILE_SHOW); file->setAccel(CTRL+Key_R, ID_FILE_REMOVE); file->insertSeparator(); - file->insertItem(i18n("&Quit"), ID_FILE_QUIT); + file->insertItem( tr("&Quit"), ID_FILE_QUIT); file->setAccel(CTRL+Key_Q, ID_FILE_QUIT); options = new QPopupMenu; - options->insertItem(i18n("&Preferences"), ID_OP_PREF); - options->insertItem(i18n("&Toggle Toolbar"), ID_OP_TOOLBAR); + options->insertItem( tr("&Preferences"), ID_OP_PREF); + options->insertItem( tr("&Toggle Toolbar"), ID_OP_TOOLBAR); if (showFilelist) - options->insertItem(i18n("Hide &Filelist"), ID_OP_FILELIST); + options->insertItem( tr("Hide &Filelist"), ID_OP_FILELIST); else - options->insertItem(i18n("Show &Filelist"), ID_OP_FILELIST); - options->insertItem(i18n("&Save Options"), ID_OP_SAVE); + options->insertItem( tr("Show &Filelist"), ID_OP_FILELIST); + options->insertItem( tr("&Save Options"), ID_OP_SAVE); phonebook = new QPopupMenu; phonebook->setCheckable(true); - phonebook->insertItem(i18n("&Show"), ID_PB_SHOW); + phonebook->insertItem( tr("&Show"), ID_PB_SHOW); phonebook->setItemChecked(ID_PB_SHOW,true); phonebook->setAccel(CTRL+Key_P, ID_PB_SHOW); - phonebook->insertItem(i18n("&Add"), ID_PB_ADD); - phonebook->insertItem(i18n("&Modify"), ID_PB_MODIFY); - phonebook->insertItem(i18n("&Delete"), ID_PB_DELETE); - phonebook->insertItem(i18n("&Save"), ID_PB_SAVE); + phonebook->insertItem( tr("&Add"), ID_PB_ADD); + phonebook->insertItem( tr("&Modify"), ID_PB_MODIFY); + phonebook->insertItem( tr("&Delete"), ID_PB_DELETE); + phonebook->insertItem( tr("&Save"), ID_PB_SAVE); QPopupMenu *help = new QPopupMenu; - help->insertItem(i18n("&Help"), ID_HELP_HELP); + help->insertItem( tr("&Help"), ID_HELP_HELP); help->setAccel(Key_F1, ID_HELP_HELP); help->insertSeparator(); - help->insertItem(i18n("&About"), ID_HELP_ABOUT); + help->insertItem( tr("&About"), ID_HELP_ABOUT); menu = new KMenuBar(this); - menu->insertItem(i18n("&File"), file); - menu->insertItem(i18n("&Options"), options); - menu->insertItem(i18n("&Phonebook"), phonebook); + menu->insertItem( tr("&File"), file); + menu->insertItem( tr("&Options"), options); + menu->insertItem( tr("&Phonebook"), phonebook); menu->insertSeparator(); - menu->insertItem(i18n("&Help"), help); + menu->insertItem( tr("&Help"), help); menu->show(); setMenu(menu); @@ -135,24 +135,24 @@ toolbar = new KToolBar(this); toolbar->insertButton(loader->loadIcon("exit.xpm"),ID_FILE_QUIT, TRUE, - i18n("Quit")); + tr("Quit")); toolbar->insertButton(loader->loadIcon("faxsend.xpm"),ID_FILE_SEND, TRUE, - i18n("Send Fax")); + tr("Send Fax")); toolbar->insertButton(loader->loadIcon("faxshow.xpm"),ID_FILE_SHOW, TRUE, - i18n("Show Jobs")); + tr("Show Jobs")); toolbar->insertButton(loader->loadIcon("faxremove.xpm"),ID_FILE_REMOVE, - TRUE, i18n("Remove Job")); + TRUE, tr("Remove Job")); toolbar->insertSeparator(); toolbar->insertButton(loader->loadIcon("page.xpm"),ID_PB_SHOW, - TRUE, i18n("Show/Hide Phonebook")); + TRUE, tr("Show/Hide Phonebook")); toolbar->insertButton(loader->loadIcon("editpaste.xpm"),ID_PB_ADD, TRUE, - i18n("Add to Phonebook")); + tr("Add to Phonebook")); toolbar->insertButton(loader->loadIcon("editcopy.xpm"),ID_PB_MODIFY, - FALSE, i18n("Modify Phonebook")); + FALSE, tr("Modify Phonebook")); toolbar->insertButton(loader->loadIcon("editcut.xpm"),ID_PB_DELETE, - FALSE, i18n("Delete from Phonebook")); + FALSE, tr("Delete from Phonebook")); toolbar->insertButton(loader->loadIcon("filefloppy.xpm"), ID_PB_SAVE, - FALSE, i18n("Save Phonebook")); + FALSE, tr("Save Phonebook")); addToolBar(toolbar); toolbar->setBarPos(KToolBar::Top); @@ -222,9 +222,9 @@ toolbar->height()+menu->height()); } if (showFilelist) - options->changeItem(i18n("Hide &Filelist"), ID_OP_FILELIST); + options->changeItem( tr("Hide &Filelist"), ID_OP_FILELIST); else - options->changeItem(i18n("Show &Filelist"), ID_OP_FILELIST); + options->changeItem( tr("Show &Filelist"), ID_OP_FILELIST); break; } case ID_OP_SAVE: { @@ -288,8 +288,8 @@ } case ID_HELP_ABOUT: { QMessageBox::about(0, - i18n("About"), - i18n("KSendFax " VERSION "\n\nCopyright 1998\n" + tr("About"), + tr("KSendFax " VERSION "\n\nCopyright 1998\n" "by Jürgen Vigna\njug@sad.it")); break; } Only in ksendfax-0.3.1/ksendfax: mainwidget.o diff -ur /home/joerg/ksendfax-0.3.1/ksendfax/mainwidget_moc.cpp ksendfax-0.3.1/ksendfax/mainwidget_moc.cpp --- /home/joerg/ksendfax-0.3.1/ksendfax/mainwidget_moc.cpp Thu Oct 8 12:26:26 1998 +++ ksendfax-0.3.1/ksendfax/mainwidget_moc.cpp Fri Apr 23 22:04:29 1999 @@ -1,20 +1,21 @@ /**************************************************************************** ** MainWidget meta object code from reading C++ file 'mainwidget.h' ** -** Created: Thu Oct 8 12:26:26 1998 -** by: The Qt Meta Object Compiler ($Revision: 2.25 $) +** Created: Fri Apr 23 22:04:29 1999 +** by: The Qt Meta Object Compiler ($Revision: 2.45 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ #if !defined(Q_MOC_OUTPUT_REVISION) -#define Q_MOC_OUTPUT_REVISION 2 -#elif Q_MOC_OUTPUT_REVISION != 2 +#define Q_MOC_OUTPUT_REVISION 3 +#elif Q_MOC_OUTPUT_REVISION != 3 #error "Moc format conflict - please regenerate all moc files" #endif #include "mainwidget.h" #include +#include const char *MainWidget::className() const @@ -24,28 +25,53 @@ QMetaObject *MainWidget::metaObj = 0; + +#if QT_VERSION >= 199 +static QMetaObjectInit init_MainWidget(&MainWidget::staticMetaObject); + +#endif + void MainWidget::initMetaObject() { if ( metaObj ) return; if ( strcmp(KTopLevelWidget::className(), "KTopLevelWidget") != 0 ) badSuperclassWarning("MainWidget","KTopLevelWidget"); - if ( !KTopLevelWidget::metaObject() ) - KTopLevelWidget::initMetaObject(); + +#if QT_VERSION >= 199 + staticMetaObject(); +} + +QString MainWidget::tr(const char* s) +{ + return qApp->translate("MainWidget",s); +} + +void MainWidget::staticMetaObject() +{ + if ( metaObj ) + return; + KTopLevelWidget::staticMetaObject(); +#else + + KTopLevelWidget::initMetaObject(); +#endif + typedef void(MainWidget::*m1_t0)(int); typedef void(MainWidget::*m1_t1)(KDNDDropZone*); typedef void(MainWidget::*m1_t2)(); m1_t0 v1_0 = &MainWidget::menuCallback; m1_t1 v1_1 = &MainWidget::slotDropEvent; m1_t2 v1_2 = &MainWidget::ExitKSendFax; - QMetaData *slot_tbl = new QMetaData[3]; + QMetaData *slot_tbl = QMetaObject::new_metadata(3); slot_tbl[0].name = "menuCallback(int)"; slot_tbl[1].name = "slotDropEvent(KDNDDropZone*)"; slot_tbl[2].name = "ExitKSendFax()"; slot_tbl[0].ptr = *((QMember*)&v1_0); slot_tbl[1].ptr = *((QMember*)&v1_1); slot_tbl[2].ptr = *((QMember*)&v1_2); - metaObj = new QMetaObject( "MainWidget", "KTopLevelWidget", + metaObj = QMetaObject::new_metaobject( + "MainWidget", "KTopLevelWidget", slot_tbl, 3, 0, 0 ); } Only in ksendfax-0.3.1/ksendfax: mainwidget_moc.o Only in ksendfax-0.3.1/ksendfax: myprocess.o diff -ur /home/joerg/ksendfax-0.3.1/ksendfax/myprocess_moc.cpp ksendfax-0.3.1/ksendfax/myprocess_moc.cpp --- /home/joerg/ksendfax-0.3.1/ksendfax/myprocess_moc.cpp Thu Oct 8 15:22:19 1998 +++ ksendfax-0.3.1/ksendfax/myprocess_moc.cpp Fri Apr 23 22:00:35 1999 @@ -1,20 +1,21 @@ /**************************************************************************** ** MyProcess meta object code from reading C++ file 'myprocess.h' ** -** Created: Thu Oct 8 15:22:19 1998 -** by: The Qt Meta Object Compiler ($Revision: 2.25 $) +** Created: Fri Apr 23 22:00:35 1999 +** by: The Qt Meta Object Compiler ($Revision: 2.45 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ #if !defined(Q_MOC_OUTPUT_REVISION) -#define Q_MOC_OUTPUT_REVISION 2 -#elif Q_MOC_OUTPUT_REVISION != 2 +#define Q_MOC_OUTPUT_REVISION 3 +#elif Q_MOC_OUTPUT_REVISION != 3 #error "Moc format conflict - please regenerate all moc files" #endif #include "myprocess.h" #include +#include const char *MyProcess::className() const @@ -24,24 +25,49 @@ QMetaObject *MyProcess::metaObj = 0; + +#if QT_VERSION >= 199 +static QMetaObjectInit init_MyProcess(&MyProcess::staticMetaObject); + +#endif + void MyProcess::initMetaObject() { if ( metaObj ) return; if ( strcmp(KShellProcess::className(), "KShellProcess") != 0 ) badSuperclassWarning("MyProcess","KShellProcess"); - if ( !KShellProcess::metaObject() ) - KShellProcess::initMetaObject(); + +#if QT_VERSION >= 199 + staticMetaObject(); +} + +QString MyProcess::tr(const char* s) +{ + return qApp->translate("MyProcess",s); +} + +void MyProcess::staticMetaObject() +{ + if ( metaObj ) + return; + KShellProcess::staticMetaObject(); +#else + + KShellProcess::initMetaObject(); +#endif + typedef void(MyProcess::*m1_t0)(KProcess*,char*,int); typedef void(MyProcess::*m1_t1)(KProcess*,char*,int); m1_t0 v1_0 = &MyProcess::ReadStderr; m1_t1 v1_1 = &MyProcess::ReadStdout; - QMetaData *slot_tbl = new QMetaData[2]; + QMetaData *slot_tbl = QMetaObject::new_metadata(2); slot_tbl[0].name = "ReadStderr(KProcess*,char*,int)"; slot_tbl[1].name = "ReadStdout(KProcess*,char*,int)"; slot_tbl[0].ptr = *((QMember*)&v1_0); slot_tbl[1].ptr = *((QMember*)&v1_1); - metaObj = new QMetaObject( "MyProcess", "KShellProcess", + metaObj = QMetaObject::new_metaobject( + "MyProcess", "KShellProcess", slot_tbl, 2, 0, 0 ); } Only in ksendfax-0.3.1/ksendfax: myprocess_moc.o diff -ur /home/joerg/ksendfax-0.3.1/ksendfax/preferences.cpp ksendfax-0.3.1/ksendfax/preferences.cpp --- /home/joerg/ksendfax-0.3.1/ksendfax/preferences.cpp Mon Jul 27 17:19:24 1998 +++ ksendfax-0.3.1/ksendfax/preferences.cpp Fri Apr 23 22:04:18 1999 @@ -17,18 +17,18 @@ Preferences::Preferences(QWidget* parent,const char* name) :Inherited( parent, name ) { - setCaption(i18n("Fax Preferences")); + setCaption( tr("Fax Preferences")); okButton->setDefault(TRUE); readConfig(); // set labels for i18n - labelCmdBox->setText(i18n("Commands")); - labelFaxCommand->setText(i18n("Send Fax:")); - labelShowCommand->setText(i18n("Show Jobs:")); - labelRemoveCommand->setText(i18n("Remove Job:")); - labelUpdateSeconds->setText(i18n("Update all n seconds:")); - labelPhonebook->setText(i18n("Phonebook:")); - okButton->setText(i18n("Ok")); - cancelButton->setText(i18n("Cancel")); + labelCmdBox->setText( tr("Commands")); + labelFaxCommand->setText( tr("Send Fax:")); + labelShowCommand->setText( tr("Show Jobs:")); + labelRemoveCommand->setText( tr("Remove Job:")); + labelUpdateSeconds->setText( tr("Update all n seconds:")); + labelPhonebook->setText( tr("Phonebook:")); + okButton->setText( tr("Ok")); + cancelButton->setText( tr("Cancel")); setPos(labelFaxCommand,InputFaxCommand); setPos(labelShowCommand,InputShowCommand); setPos(labelRemoveCommand,InputRemoveCommand); @@ -56,7 +56,7 @@ str = config->readEntry("remove_command"); if (!str.isEmpty()) InputRemoveCommand->setText(str); - str = config->readNumEntry("update_seconds"); + str = config->readEntry("update_seconds"); if (!str.isEmpty()) InputUpdateSeconds->setText(str); str = config->readEntry("phonebook"); Only in ksendfax-0.3.1/ksendfax: preferences.o diff -ur /home/joerg/ksendfax-0.3.1/ksendfax/preferences_moc.cpp ksendfax-0.3.1/ksendfax/preferences_moc.cpp --- /home/joerg/ksendfax-0.3.1/ksendfax/preferences_moc.cpp Mon Sep 28 13:13:08 1998 +++ ksendfax-0.3.1/ksendfax/preferences_moc.cpp Fri Apr 23 22:01:59 1999 @@ -1,20 +1,21 @@ /**************************************************************************** ** Preferences meta object code from reading C++ file 'preferences.h' ** -** Created: Mon Sep 28 13:13:08 1998 -** by: The Qt Meta Object Compiler ($Revision: 2.25 $) +** Created: Fri Apr 23 22:01:59 1999 +** by: The Qt Meta Object Compiler ($Revision: 2.45 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ #if !defined(Q_MOC_OUTPUT_REVISION) -#define Q_MOC_OUTPUT_REVISION 2 -#elif Q_MOC_OUTPUT_REVISION != 2 +#define Q_MOC_OUTPUT_REVISION 3 +#elif Q_MOC_OUTPUT_REVISION != 3 #error "Moc format conflict - please regenerate all moc files" #endif #include "preferences.h" #include +#include const char *Preferences::className() const @@ -24,20 +25,45 @@ QMetaObject *Preferences::metaObj = 0; + +#if QT_VERSION >= 199 +static QMetaObjectInit init_Preferences(&Preferences::staticMetaObject); + +#endif + void Preferences::initMetaObject() { if ( metaObj ) return; if ( strcmp(PreferencesData::className(), "PreferencesData") != 0 ) badSuperclassWarning("Preferences","PreferencesData"); - if ( !PreferencesData::metaObject() ) - PreferencesData::initMetaObject(); + +#if QT_VERSION >= 199 + staticMetaObject(); +} + +QString Preferences::tr(const char* s) +{ + return qApp->translate("Preferences",s); +} + +void Preferences::staticMetaObject() +{ + if ( metaObj ) + return; + PreferencesData::staticMetaObject(); +#else + + PreferencesData::initMetaObject(); +#endif + typedef void(Preferences::*m1_t0)(); m1_t0 v1_0 = &Preferences::okPressed; - QMetaData *slot_tbl = new QMetaData[1]; + QMetaData *slot_tbl = QMetaObject::new_metadata(1); slot_tbl[0].name = "okPressed()"; slot_tbl[0].ptr = *((QMember*)&v1_0); - metaObj = new QMetaObject( "Preferences", "PreferencesData", + metaObj = QMetaObject::new_metaobject( + "Preferences", "PreferencesData", slot_tbl, 1, 0, 0 ); } Only in ksendfax-0.3.1/ksendfax: preferences_moc.o Only in ksendfax-0.3.1/ksendfax: preferencesdata.o diff -ur /home/joerg/ksendfax-0.3.1/ksendfax/preferencesdata_moc.cpp ksendfax-0.3.1/ksendfax/preferencesdata_moc.cpp --- /home/joerg/ksendfax-0.3.1/ksendfax/preferencesdata_moc.cpp Mon Sep 28 13:13:09 1998 +++ ksendfax-0.3.1/ksendfax/preferencesdata_moc.cpp Fri Apr 23 22:04:25 1999 @@ -1,20 +1,21 @@ /**************************************************************************** ** PreferencesData meta object code from reading C++ file 'preferencesdata.h' ** -** Created: Mon Sep 28 13:13:09 1998 -** by: The Qt Meta Object Compiler ($Revision: 2.25 $) +** Created: Fri Apr 23 22:04:25 1999 +** by: The Qt Meta Object Compiler ($Revision: 2.45 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ #if !defined(Q_MOC_OUTPUT_REVISION) -#define Q_MOC_OUTPUT_REVISION 2 -#elif Q_MOC_OUTPUT_REVISION != 2 +#define Q_MOC_OUTPUT_REVISION 3 +#elif Q_MOC_OUTPUT_REVISION != 3 #error "Moc format conflict - please regenerate all moc files" #endif #include "preferencesdata.h" #include +#include const char *PreferencesData::className() const @@ -24,20 +25,45 @@ QMetaObject *PreferencesData::metaObj = 0; + +#if QT_VERSION >= 199 +static QMetaObjectInit init_PreferencesData(&PreferencesData::staticMetaObject); + +#endif + void PreferencesData::initMetaObject() { if ( metaObj ) return; if ( strcmp(QDialog::className(), "QDialog") != 0 ) badSuperclassWarning("PreferencesData","QDialog"); - if ( !QDialog::metaObject() ) - QDialog::initMetaObject(); + +#if QT_VERSION >= 199 + staticMetaObject(); +} + +QString PreferencesData::tr(const char* s) +{ + return qApp->translate("PreferencesData",s); +} + +void PreferencesData::staticMetaObject() +{ + if ( metaObj ) + return; + QDialog::staticMetaObject(); +#else + + QDialog::initMetaObject(); +#endif + typedef void(PreferencesData::*m1_t0)(); m1_t0 v1_0 = &PreferencesData::okPressed; - QMetaData *slot_tbl = new QMetaData[1]; + QMetaData *slot_tbl = QMetaObject::new_metadata(1); slot_tbl[0].name = "okPressed()"; slot_tbl[0].ptr = *((QMember*)&v1_0); - metaObj = new QMetaObject( "PreferencesData", "QDialog", + metaObj = QMetaObject::new_metaobject( + "PreferencesData", "QDialog", slot_tbl, 1, 0, 0 ); } Only in ksendfax-0.3.1/ksendfax: preferencesdata_moc.o Only in ksendfax-0.3.1/: libtool Only in ksendfax-0.3.1/po: Makefile Only in ksendfax-0.3.1/: stamp-h