API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Mar 30th, 2010
238
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
C++ 4.54 KB | None | 0 0
raw download clone embed print report
  1. Index: okular/ui/formwidgets.cpp
  2. ===================================================================
  3. --- okular/ui/formwidgets.cpp   (revision 1109126)
  4. +++ okular/ui/formwidgets.cpp   (working copy)
  5. @@ -299,7 +299,7 @@
  6.  
  7.  
  8.  FormLineEdit::FormLineEdit( Okular::FormFieldText * text, QWidget * parent )
  9. -    : QLineEdit( parent ), FormWidgetIface( this, text ), m_form( text )
  10. +    : KLineEdit( parent ), FormWidgetIface( this, text ), m_form( text )
  11.  {
  12.      int maxlen = m_form->maximumLength();
  13.      if ( maxlen >= 0 )
  14. @@ -404,7 +404,7 @@
  15.  
  16.  
  17.  ComboEdit::ComboEdit( Okular::FormFieldChoice * choice, QWidget * parent )
  18. -    : QComboBox( parent ), FormWidgetIface( this, choice ), m_form( choice )
  19. +    : KComboBox( parent ), FormWidgetIface( this, choice ), m_form( choice )
  20.  {
  21.      addItems( m_form->choices() );
  22.      setEditable( true );
  23. Index: okular/ui/annotationwidgets.h
  24. ===================================================================
  25. --- okular/ui/annotationwidgets.h   (revision 1109126)
  26. +++ okular/ui/annotationwidgets.h   (working copy)
  27. @@ -15,7 +15,7 @@
  28.  #include "core/annotations.h"
  29.  
  30.  class QCheckBox;
  31. -class QComboBox;
  32. +class KComboBox;
  33.  class QDoubleSpinBox;
  34.  class QLabel;
  35.  class QWidget;
  36. @@ -51,7 +51,7 @@
  37.  private:
  38.      QString m_icon;
  39.      QLabel * m_iconLabel;
  40. -    QComboBox * m_comboItems;
  41. +    KComboBox * m_comboItems;
  42.      int m_previewSize;
  43.  };
  44.  
  45. @@ -167,7 +167,7 @@
  46.  
  47.  private:
  48.      Okular::HighlightAnnotation * m_hlAnn;
  49. -    QComboBox * m_typeCombo;
  50. +    KComboBox * m_typeCombo;
  51.  };
  52.  
  53.  class GeomAnnotationWidget
  54. @@ -185,7 +185,7 @@
  55.  
  56.  private:
  57.      Okular::GeomAnnotation * m_geomAnn;
  58. -    QComboBox * m_typeCombo;
  59. +    KComboBox * m_typeCombo;
  60.      QCheckBox * m_useColor;
  61.      KColorButton * m_innerColor;
  62.      QDoubleSpinBox * m_spinSize;
  63. Index: okular/ui/annotwindow.h
  64. ===================================================================
  65. --- okular/ui/annotwindow.h (revision 1109126)
  66. +++ okular/ui/annotwindow.h (working copy)
  67. @@ -18,7 +18,7 @@
  68.  class Annotation;
  69.  }
  70.  
  71. -class QTextEdit;
  72. +class KTextEdit;
  73.  class MovableTitle;
  74.  
  75.  class AnnotWindow : public QFrame
  76. @@ -31,7 +31,7 @@
  77.          
  78.      private:
  79.          MovableTitle * m_title;
  80. -        QTextEdit *textEdit;
  81. +        KTextEdit *textEdit;
  82.          QColor m_color;
  83.      public:
  84.          Okular::Annotation* m_annot;
  85. Index: okular/ui/annotationpropertiesdialog.h
  86. ===================================================================
  87. --- okular/ui/annotationpropertiesdialog.h  (revision 1109126)
  88. +++ okular/ui/annotationpropertiesdialog.h  (working copy)
  89. @@ -13,7 +13,8 @@
  90.  #include <kpagedialog.h>
  91.  
  92.  class QLabel;
  93. -class QLineEdit;
  94. +class KLineEdit;
  95. +class KComboBox;
  96.  class KColorButton;
  97.  class KIntNumInput;
  98.  class AnnotationWidget;
  99. @@ -36,7 +37,7 @@
  100.      bool modified;
  101.      Okular::Annotation* m_annot;    //source annotation
  102.      //dialog widgets:
  103. -    QLineEdit *AuthorEdit;
  104. +    KLineEdit *AuthorEdit;
  105.      KColorButton *colorBn;
  106.      KIntNumInput *m_opacity;
  107.      AnnotationWidget *m_annotWidget;
  108. Index: okular/ui/formwidgets.h
  109. ===================================================================
  110. --- okular/ui/formwidgets.h (revision 1109126)
  111. +++ okular/ui/formwidgets.h (working copy)
  112. @@ -13,8 +13,8 @@
  113.  #include "core/area.h"
  114.  
  115.  #include <qcheckbox.h>
  116. -#include <qcombobox.h>
  117. -#include <qlineedit.h>
  118. +#include <kcombobox.h>
  119. +#include <klineedit.h>
  120.  #include <qlistwidget.h>
  121.  #include <qpushbutton.h>
  122.  #include <qradiobutton.h>
  123. @@ -154,7 +154,7 @@
  124.          Okular::FormFieldButton * m_form;
  125.  };
  126.  
  127. -class FormLineEdit : public QLineEdit, public FormWidgetIface
  128. +class FormLineEdit : public KLineEdit, public FormWidgetIface
  129.  {
  130.      Q_OBJECT
  131.  
  132. @@ -213,7 +213,7 @@
  133.  };
  134.  
  135.  
  136. -class ComboEdit : public QComboBox, public FormWidgetIface
  137. +class ComboEdit : public KComboBox, public FormWidgetIface
  138.  {
  139.      Q_OBJECT
  140.  
  141. Index: okular/ui/presentationwidget.h
  142. ===================================================================
  143. --- okular/ui/presentationwidget.h  (revision 1109126)
  144. +++ okular/ui/presentationwidget.h  (working copy)
  145. @@ -17,7 +17,7 @@
  146.  #include "core/observer.h"
  147.  #include "core/pagetransition.h"
  148.  
  149. -class QLineEdit;
  150. +class KLineEdit;
  151.  class QToolBar;
  152.  class QTimer;
  153.  class KActionCollection;
  154. @@ -121,7 +121,7 @@
  155.          int m_frameIndex;
  156.          QStringList m_metaStrings;
  157.          QToolBar * m_topBar;
  158. -        QLineEdit *m_pagesEdit;
  159. +        KLineEdit *m_pagesEdit;
  160.          PresentationSearchBar *m_searchBar;
  161.          KActionCollection * m_ac;
  162.          KSelectAction * m_screenSelect;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!