Changeset 232

Timestamp:

Oct 16, 2009, 6:11:08 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

tools: linguist: Added #ifndef QT_NO_PRINTER / QT_NO_DRAGANDDROP to make it build on OS/2.

Location:

trunk/tools/linguist/linguist

Files:

• mainwindow.cpp (modified) (6 diffs)
• mainwindow.h (modified) (1 diff)
• printout.cpp (modified) (2 diffs)
• printout.h (modified) (2 diffs)

trunk/tools/linguist/linguist/mainwindow.cpp ¶

@@ -877 +877 @@
 void MainWindow::print()
 {
+#ifndef QT_NO_PRINTER
     int pageNum = 0;
     QPrintDialog dlg(&m_printer, this);
@@ -954 +955 @@
         statusBar()->showMessage(tr("Printing aborted"), MessageMS);
     }
+#endif
 }
 
@@ -1230 +1232 @@
 void MainWindow::printPhraseBook(QAction *action)
 {
+#ifndef QT_NO_PRINTER
     PhraseBook *phraseBook = m_phraseBookMenu[PhrasePrintMenu].value(action);
 
@@ -1261 +1264 @@
         statusBar()->showMessage(tr("Printing aborted"), MessageMS);
     }
+#endif
 }
 
@@ -2622 +2626 @@
 bool MainWindow::eventFilter(QObject *object, QEvent *event)
 {
+#ifndef QT_NO_DRAGANDDROP
     if (event->type() == QEvent::DragEnter) {
         QDragEnterEvent *e = static_cast<QDragEnterEvent*>(event);
@@ -2640 +2645 @@
         e->acceptProposedAction();
         return true;
-    } else if (event->type() == QEvent::KeyPress) {
+    } else
+#endif
+    if (event->type() == QEvent::KeyPress) {
         if (static_cast<QKeyEvent *>(event)->key() == Qt::Key_Escape) {
             if (object == m_messageEditor)

trunk/tools/linguist/linguist/mainwindow.h ¶

@@ -229 +229 @@
     QList<PhraseBook *> m_phraseBooks;
     QMap<QAction *, PhraseBook *> m_phraseBookMenu[3];
+#ifndef QT_NO_PRINTER
     QPrinter m_printer;
+#endif
 
     FindDialog *m_findDialog;

trunk/tools/linguist/linguist/printout.cpp ¶

@@ -46 +46 @@
 
 QT_BEGIN_NAMESPACE
+
+#ifndef QT_NO_PRINTER
 
 PrintOut::PrintOut(QPrinter *printer)
@@ -208 +210 @@
 }
 
+#endif // QT_NO_PRINTER
+
 QT_END_NAMESPACE

trunk/tools/linguist/linguist/printout.h ¶

@@ -54 +54 @@
 class QPrinter;
 class QFontMetrics;
+
+#ifndef QT_NO_PRINTER
 
 class PrintOut
@@ -116 +118 @@
 };
 
+#endif // QT_NO_PRINTER
+
 QT_END_NAMESPACE