--- demos/macmainwindow/main.cpp	2008-04-03 09:05:01.000000000 -0600
+++ demos/macmainwindow/main.cpp	2008-04-03 09:05:50.000000000 -0600
@@ -80,8 +80,8 @@
         searchActionGroup->addAction(fulltextAction);
         searchActionGroup->setExclusive(true);
         
-        MenuRef macSearchMenu = searchMenu->macMenu(0);
-        HISearchFieldSetSearchMenu(searchField, macSearchMenu);
+        // MenuRef macSearchMenu = searchMenu->macMenu(0);
+        // HISearchFieldSetSearchMenu(searchField, macSearchMenu);
         setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
 
     }
--- examples/richtext/orderform/detailsdialog.cpp	2008-04-03 09:03:35.000000000 -0600
+++ examples/richtext/orderform/detailsdialog.cpp	2008-04-03 09:03:53.000000000 -0600
@@ -140,7 +140,7 @@
 //! [6]
 
 //! [7]
-void DetailsDialog::verify()
+void DetailsDialog::verifyForm()
 {
     if (!nameEdit->text().isEmpty() && !addressEdit->toPlainText().isEmpty()) {
         accept();
--- examples/richtext/orderform/detailsdialog.h	2008-04-03 09:03:30.000000000 -0600
+++ examples/richtext/orderform/detailsdialog.h	2008-04-03 09:03:58.000000000 -0600
@@ -68,7 +68,7 @@
     DetailsDialog(const QString &title, QWidget *parent);
 
 public slots:
-    void verify();
+    void verifyForm();
 
 public:
     QList<QPair<QString, int> > orderItems();
--- examples/widgets/calculator/calculator.cpp	2008-04-03 09:01:26.000000000 -0600
+++ examples/widgets/calculator/calculator.cpp	2008-04-03 09:02:37.000000000 -0600
@@ -82,38 +82,38 @@
                                        SLOT(digitClicked()));
     }
 
-    Button *pointButton = createButton(tr("."), digitColor, SLOT(pointClicked()));
-    Button *changeSignButton = createButton(tr("\261"), digitColor, SLOT(changeSignClicked()));
+    class Button *pointButton = createButton(tr("."), digitColor, SLOT(pointClicked()));
+    class Button *changeSignButton = createButton(tr("\261"), digitColor, SLOT(changeSignClicked()));
 
-    Button *backspaceButton = createButton(tr("Backspace"), backspaceColor,
+    class Button *backspaceButton = createButton(tr("Backspace"), backspaceColor,
                                    SLOT(backspaceClicked()));
-    Button *clearButton = createButton(tr("Clear"), backspaceColor, SLOT(clear()));
-    Button *clearAllButton = createButton(tr("Clear All"), backspaceColor.light(120),
+    class Button *clearButton = createButton(tr("Clear"), backspaceColor, SLOT(clear()));
+    class Button *clearAllButton = createButton(tr("Clear All"), backspaceColor.light(120),
                                   SLOT(clearAll()));
 
-    Button *clearMemoryButton = createButton(tr("MC"), memoryColor,
+    class Button *clearMemoryButton = createButton(tr("MC"), memoryColor,
                                      SLOT(clearMemory()));
-    Button *readMemoryButton = createButton(tr("MR"), memoryColor, SLOT(readMemory()));
-    Button *setMemoryButton = createButton(tr("MS"), memoryColor, SLOT(setMemory()));
-    Button *addToMemoryButton = createButton(tr("M+"), memoryColor,
+    class Button *readMemoryButton = createButton(tr("MR"), memoryColor, SLOT(readMemory()));
+    class Button *setMemoryButton = createButton(tr("MS"), memoryColor, SLOT(setMemory()));
+    class Button *addToMemoryButton = createButton(tr("M+"), memoryColor,
                                      SLOT(addToMemory()));
 
-    Button *divisionButton = createButton(tr("\367"), operatorColor,
+    class Button *divisionButton = createButton(tr("\367"), operatorColor,
                                   SLOT(multiplicativeOperatorClicked()));
-    Button *timesButton = createButton(tr("\327"), operatorColor,
+    class Button *timesButton = createButton(tr("\327"), operatorColor,
                                SLOT(multiplicativeOperatorClicked()));
-    Button *minusButton = createButton(tr("-"), operatorColor,
+    class Button *minusButton = createButton(tr("-"), operatorColor,
                                SLOT(additiveOperatorClicked()));
-    Button *plusButton = createButton(tr("+"), operatorColor,
+    class Button *plusButton = createButton(tr("+"), operatorColor,
                               SLOT(additiveOperatorClicked()));
 
-    Button *squareRootButton = createButton(tr("Sqrt"), operatorColor,
+    class Button *squareRootButton = createButton(tr("Sqrt"), operatorColor,
                                     SLOT(unaryOperatorClicked()));
-    Button *powerButton = createButton(tr("x\262"), operatorColor,
+    class Button *powerButton = createButton(tr("x\262"), operatorColor,
                                SLOT(unaryOperatorClicked()));
-    Button *reciprocalButton = createButton(tr("1/x"), operatorColor,
+    class Button *reciprocalButton = createButton(tr("1/x"), operatorColor,
                                     SLOT(unaryOperatorClicked()));
-    Button *equalButton = createButton(tr("="), operatorColor.light(120),
+    class Button *equalButton = createButton(tr("="), operatorColor.light(120),
                                SLOT(equalClicked()));
 //! [4]
 
@@ -160,7 +160,7 @@
 //! [7]
 void Calculator::digitClicked()
 {
-    Button *clickedButton = qobject_cast<Button *>(sender());
+    class Button *clickedButton = qobject_cast<class Button *>(sender());
     int digitValue = clickedButton->text().toInt();
     if (display->text() == "0" && digitValue == 0.0)
         return;
@@ -177,7 +177,7 @@
 void Calculator::unaryOperatorClicked()
 //! [8] //! [9]
 {
-    Button *clickedButton = qobject_cast<Button *>(sender());
+    class Button *clickedButton = qobject_cast<class Button *>(sender());
     QString clickedOperator = clickedButton->text();
     double operand = display->text().toDouble();
     double result = 0.0;
@@ -206,7 +206,7 @@
 void Calculator::additiveOperatorClicked()
 //! [10] //! [11]
 {
-    Button *clickedButton = qobject_cast<Button *>(sender());
+    class Button *clickedButton = qobject_cast<class Button *>(sender());
     QString clickedOperator = clickedButton->text();
     double operand = display->text().toDouble();
 
@@ -246,7 +246,7 @@
 void Calculator::multiplicativeOperatorClicked()
 //! [18] //! [19]
 {
-    Button *clickedButton = qobject_cast<Button *>(sender());
+    class Button *clickedButton = qobject_cast<class Button *>(sender());
     QString clickedOperator = clickedButton->text();
     double operand = display->text().toDouble();
 
@@ -392,11 +392,11 @@
 }
 
 //! [33] //! [34]
-Button *Calculator::createButton(const QString &text, const QColor &color,
+class Button *Calculator::createButton(const QString &text, const QColor &color,
 //! [34] //! [35]
                                  const char *member)
 {
-    Button *button = new Button(text, color);
+    class Button *button = new Button(text, color);
     connect(button, SIGNAL(clicked()), this, member);
     return button;
 }
--- examples/widgets/calculator/calculator.h	2008-04-03 09:01:21.000000000 -0600
+++ examples/widgets/calculator/calculator.h	2008-04-03 09:01:55.000000000 -0600
@@ -79,7 +79,7 @@
 //! [1]
 private:
 //! [1] //! [2]
-    Button *createButton(const QString &text, const QColor &color,
+    class Button *createButton(const QString &text, const QColor &color,
                          const char *member);
     void abortOperation();
     bool calculate(double rightOperand, const QString &pendingOperator);
@@ -104,7 +104,7 @@
 //! [9] //! [10]
 
     enum { NumDigitButtons = 10 };
-    Button *digitButtons[NumDigitButtons];
+    class Button *digitButtons[NumDigitButtons];
 };
 //! [10]